Merge remote-tracking branch 'origin/touchdown'

Browse source

Conflicts:
	static/css/quay.css
	static/js/controllers.js
	test/data/test.db

...

This commit is contained in:

Jake Moshenko 2014-07-07 15:33:51 -04:00

parent 64fe29698c 6a57af092c

commit c338b7d621

33 changed files with 1296 additions and 242 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.