krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2017-12-15 05:37:04 +00:00
parent c28ec24c33 44c7e8c9dc
commit e229bc5042
22 changed files with 473 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/components/settings/subscription.vue
View File

@@ -90,6 +90,11 @@
li {{ $t('giftSubscriptionText2') }}
li {{ $t('giftSubscriptionText3') }}
h4 {{ $t('giftSubscriptionText4') }}
.col-6
h2 {{ $t('winterPromoGiftHeader') }}
p {{ $t('winterPromoGiftDetails1') }}
p {{ $t('winterPromoGiftDetails2') }}
</template>
<style scoped>