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

Conflicts:
	views/static/front.jade

2014-01-05 16:37:05 -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

#2186 hide task attrs unless allocationMode == 'taskbased'

2014-01-05 15:16:55 -07:00

static

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

2014-01-05 16:37:05 -07: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