Merge branch 'develop' into sabrecat/party-page

This commit is contained in:
Blade Barringer
2015-08-22 21:42:05 -05:00
7 changed files with 16 additions and 19 deletions
@@ -29,7 +29,7 @@ div(ng-if='::profile.contributor.level || user._id == profile._id')
small
=env.t('contribText')
| 
+aLink('http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', env.t('readMore'))
+aLink('http://habitica.wikia.com/wiki/Contributing_to_Habitica', env.t('readMore'))
| .
hr