Marcelo Sizer eb71a2341f Merge branch 'develop' of https://github.com/Sinza-/habitrpg into develop ...

Replace hard coded strings for env.t on views/shared/.

2013-12-31 00:17:30 -02:00

..

app.json

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

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

main.json

Merge branch 'develop' of https://github.com/Sinza-/habitrpg into develop

2013-12-31 00:17:30 -02:00

privacy.json

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

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

terms.json

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

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