Sabe Jones 8e56222fc7 Merge branch 'release' into develop

2017-07-05 20:11:13 +00:00

..

components

Group Approvals Formatting - Fix #8677 (#8784)

2017-07-01 09:33:24 -07:00

controllers

Merged in develop

2017-06-27 22:23:13 -06:00

directives

Prevented modal close and showed correct due class in modal

2017-06-16 12:28:42 -06:00

filters

rename website/client to website/client-old

2016-09-14 15:06:32 +02:00

services

Merge branch 'release' into develop

2017-07-05 20:11:13 +00:00

.eslintrc

rename website/client to website/client-old

2016-09-14 15:06:32 +02:00

app.js

Clean up references to repo as HabitRPG/habitrpg (#8742)

2017-06-06 18:51:54 -07:00

config.js

Login Incentives (#8230)

2016-11-23 19:34:09 -06:00

env.js

rename website/client to website/client-old

2016-09-14 15:06:32 +02:00

static.js

rename website/client to website/client-old

2016-09-14 15:06:32 +02:00