Tyler Renelle eeaeb5c006 Merge remote-tracking branch 'DanielHeath/develop' into develop ...

Conflicts:
	views/static/front.jade

2014-01-05 16:37:05 -07:00

..

api.jade

#2217 add note about base-url for api routes

2014-01-01 22:47:38 -07:00

front.jade

Merge remote-tracking branch 'DanielHeath/develop' into develop

2014-01-05 16:37:05 -07:00

header.jade

rewrite: converted static pages, removed old unused static pages

2013-09-01 13:30:53 -04:00

layout.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

privacy.jade

remove unnecessary text tags

2014-01-05 13:23:45 +01:00

terms.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