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

Browse source

Conflicts:
	endpoints/web.py
	static/directives/signup-form.html
	static/js/app.js
	static/js/controllers.js
	static/partials/landing.html
	static/partials/view-repo.html
	test/data/test.db

...

This commit is contained in:

jakedt 2014-04-14 19:37:22 -04:00

parent 90c032ec21 724fec1b74

commit 0827e0fbac

45 changed files with 1149 additions and 306 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.