 Blade Barringer
|
477d3d6085
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-02-12 13:32:23 -06:00 |
|
|
Blade Barringer
|
a6a0282c82
|
Corrected common image paths
|
2015-02-12 12:05:38 -06:00 |
|
|
Blade Barringer
|
85817b2b4e
|
Corrected path to habitrpg logo
|
2015-02-12 11:50:55 -06:00 |
|
|
Blade Barringer
|
8ac9dc3ced
|
Merge branch 'develop' into common-convert
|
2015-02-10 16:27:46 -06:00 |
|
|
Blade Barringer
|
6548db8095
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-02-09 22:41:52 -06:00 |
|
|
Blade Barringer
|
75c9b5a978
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/groups.js
src/controllers/payments/index.js
src/controllers/user.js
src/models/user.js
|
2015-02-09 22:21:27 -06:00 |
|
|
Blade Barringer
|
dca2f13dda
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
bower.json
public/manifest.json
src/controllers/auth.js
|
2015-02-05 11:20:40 -06:00 |
|
|
Blade Barringer
|
cc767efa20
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/auth.js
src/controllers/challenges.js
src/controllers/groups.js
src/controllers/members.js
src/controllers/payments/index.js
src/controllers/user.js
src/middleware.js
src/models/user.js
|
2015-02-03 21:13:55 -06:00 |
|
|
Blade Barringer
|
8a8ce8d80d
|
Moved folders to website directory
|
2015-02-03 14:10:55 -06:00 |
|