Merge remote-tracking branch 'origin/master' into tagyourit

Browse source

Conflicts:
	static/css/quay.css
	static/js/graphing.js
	static/partials/view-repo.html
	test/data/test.db

...

This commit is contained in:

jakedt 2014-04-15 15:58:30 -04:00

parent d768b60a3c 27072d4a2d

commit 3f42d15335

132 changed files with 4266 additions and 1924 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

test/data/test.db

View file

Binary file not shown.