Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	website/views/shared/profiles/achievements.jade
This commit is contained in:
remmy poos
2015-02-17 22:03:58 +08:00
parent f6e549caf0 7a08ff360f
commit a3aaa0370d
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/shared/profiles/achievements.jade
+12
View File
@@ -129,14 +129,26 @@ div(ng-if='::profile.achievements.helpedHabit')
+aLink('http://community.habitrpg.com/node/290', env.t('helpedText2'))
hr
<<<<<<< HEAD
div(ng-if='profile.achievements.veteran')
.achievement.achievement-alpha
=======
div(ng-if=':: profile.achievements.veteran')
.achievement.achievement-cake
>>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101
div(ng-if='::profile.achievements.veteran')
h5=env.t('veteran')
small=env.t('veteranText')
div(ng-if='::profile.achievements.originalUser')
h5=env.t('originalUser')
small!=env.t('originalUserText')
hr
<<<<<<< HEAD
div(ng-if='::profile.achievements.originalUser')
=======
div(ng-if=':: profile.achievements.originalUser')
>>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101
.achievement.achievement-alpha
div(ng-if='::profile.achievements.originalUser')
h5=env.t('originalUser')