Stefan Parviainen 2c1618bc10 Fix conflict and update strings ...

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

2017-11-15 20:40:51 +01:00

..

AliasSettings.js

Only show editing UI for aliases/related_groups for users /w power

2017-10-24 16:19:09 +01:00

ColorSettings.js

Merge branch 'develop' into travis/granular-settings

2017-11-13 12:29:36 -07:00

RelatedGroupSettings.js

canSetRelatedRooms -> canSetRelatedGroups

2017-10-24 17:57:26 +01:00

UrlPreviewSettings.js

Fix conflict and update strings

2017-11-15 20:40:51 +01:00