sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit a3aaa0370d
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
website/views/shared/profiles/achievements.jade
View file

@ -129,14 +129,26 @@ div(ng-if='::profile.achievements.helpedHabit')
+aLink('http://community.habitrpg.com/node/290', env.t('helpedText2')) +aLink('http://community.habitrpg.com/node/290', env.t('helpedText2'))
hr hr
<<<<<<< HEAD
div(ng-if='profile.achievements.veteran') div(ng-if='profile.achievements.veteran')
.achievement.achievement-alpha .achievement.achievement-alpha
=======
div(ng-if=':: profile.achievements.veteran')
.achievement.achievement-cake
>>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101
div(ng-if='::profile.achievements.veteran') div(ng-if='::profile.achievements.veteran')
h5=env.t('veteran') h5=env.t('veteran')
small=env.t('veteranText') small=env.t('veteranText')
div(ng-if='::profile.achievements.originalUser')
h5=env.t('originalUser')
small!=env.t('originalUserText')
hr hr
<<<<<<< HEAD
div(ng-if='::profile.achievements.originalUser') div(ng-if='::profile.achievements.originalUser')
=======
div(ng-if=':: profile.achievements.originalUser')
>>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101
.achievement.achievement-alpha .achievement.achievement-alpha
div(ng-if='::profile.achievements.originalUser') div(ng-if='::profile.achievements.originalUser')
h5=env.t('originalUser') h5=env.t('originalUser')