Tyler Renelle 3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop ... Conflicts: views/shared/footer.jade		2014-01-04 16:02:22 -07:00
..
main	apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops)	2013-12-15 14:16:04 -07:00
options	Merge remote-tracking branch 'origin/sabe/attributes' into develop	2014-01-04 16:02:22 -07:00
shared	Merge remote-tracking branch 'origin/sabe/attributes' into develop	2014-01-04 16:02:22 -07:00
static	Merge pull request #2174 from Sinza-/develop	2014-01-01 22:33:13 -08:00
index.jade	Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all.	2013-12-30 00:14:55 -02:00