mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-04-14 19:47:03 +00:00
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
This commit is contained in:
commit
6548db8095
2 changed files with 18 additions and 5 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 9.1 KiB |
|
|
@ -27,8 +27,8 @@ block content
|
|||
h1=env.t('communityGuidelines')
|
||||
p.pagemeta
|
||||
|Last updated
|
||||
=env.t('October')
|
||||
| 27, 2014
|
||||
=env.t('February')
|
||||
| 9, 2015
|
||||
h2=env.t('commGuideHeadingWelcome')
|
||||
div(class='clearfix')
|
||||
img(class='pull-left', src='/community-guidelines-images/intro.png', alt='')
|
||||
|
|
@ -91,6 +91,10 @@ block content
|
|||
strong Alys (LadyAlys
|
||||
=env.t('commGuidePara011c')
|
||||
|)
|
||||
li
|
||||
strong Blade (crookedneighbor
|
||||
=env.t('commGuidePara011d')
|
||||
|)
|
||||
li
|
||||
strong Breadstrings
|
||||
li
|
||||
|
|
@ -117,7 +121,10 @@ block content
|
|||
li!=env.t('commGuideList02F')
|
||||
li!=env.t('commGuideList02G')
|
||||
li!=env.t('commGuideList02H')
|
||||
li!=env.t('commGuideList02I')
|
||||
p!=env.t('commGuidePara019')
|
||||
p=env.t('commGuidePara020')
|
||||
p
|
||||
p=env.t('commGuidePara021')
|
||||
|
||||
h3=env.t('commGuideHeadingTavern')
|
||||
|
|
@ -170,8 +177,7 @@ block content
|
|||
li Alys
|
||||
li benmanley (Pixel)
|
||||
li colegleason (Cole)
|
||||
li deilann (Ryan)
|
||||
li djuretic
|
||||
li deilann (Ryan v*)
|
||||
li Fandekasp
|
||||
li Lemoness
|
||||
li litenull
|
||||
|
|
@ -180,8 +186,14 @@ block content
|
|||
li Sinza-
|
||||
li snicker
|
||||
li thepeopleseason
|
||||
li wc8
|
||||
li zakkain
|
||||
li crookedneighbor (Blade)
|
||||
li huaruiwu
|
||||
li negue
|
||||
li ruddfawcett
|
||||
li wogsland
|
||||
li MagicMicky
|
||||
li viirus
|
||||
|
||||
h3=env.t('commGuideHeadingWiki')
|
||||
div(class='clearfix')
|
||||
|
|
@ -227,6 +239,7 @@ block content
|
|||
li=env.t('commGuideList05C')
|
||||
li=env.t('commGuideList05D')
|
||||
li=env.t('commGuideList05E')
|
||||
li=env.t('commGuideList05F')
|
||||
h4=env.t('commGuideHeadingModerateInfractions')
|
||||
p=env.t('commGuidePara054')
|
||||
p=env.t('commGuidePara055')
|
||||
|
|
|
|||
Loading…
Reference in a new issue