Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:56:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'groups' of github.com:sethalves/hifi into groups

Browse source
This commit is contained in:
Seth Alves 2016-07-29 13:10:30 -07:00
commit 11cf01e5ae
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/resources/describe-settings.json
View file

@ -459,7 +459,7 @@
"can_add_new_categories": true, "can_add_new_categories": true,
"can_add_new_rows": false, "can_add_new_rows": false,
"new_category_placeholder": "Add Group", "new_category_placeholder": "Add Group",
"new_category_message": "Reload to see ranks", "new_category_message": "Save and reload to see ranks",
"groups": [ "groups": [
{ {
@ -554,7 +554,7 @@
"can_add_new_categories": true, "can_add_new_categories": true,
"can_add_new_rows": false, "can_add_new_rows": false,
"new_category_placeholder": "Add Blacklist Group", "new_category_placeholder": "Add Blacklist Group",
"new_category_message": "Reload to see ranks", "new_category_message": "Save and reload to see ranks",
"groups": [ "groups": [
{ {