Marcelo Sizer 55fbd7d439 Merge remote-tracking branch 'upstream/develop' into develop ...

Conflicts:
	locales/en/app.json

2013-12-30 10:33:08 -02:00

..

main

apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops)

2013-12-15 14:16:04 -07:00

options

classes: fix class-modal heads. Also, little class title display trick

2013-12-29 12:21:56 -07:00

shared

classes: fix class-modal heads. Also, little class title display trick

2013-12-29 12:21:56 -07:00

static

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

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