diff options
| author | Christian S <christian@pix-art.de> | 2016-04-21 20:12:14 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-21 20:12:14 +0200 |
| commit | f7c700880a537064ab88001431b6040909920b44 (patch) | |
| tree | fcc0d16bd71a18ba959284ab31a4d345b5383d3e /src/main/java/eu/siacs/conversations/Config.java | |
| parent | 9e15ac10ccc4d021c10eeaed8988fa14ea73e3dc (diff) | |
| parent | 1a073ca45455dcf46bb4d8bcaa962030a65c435a (diff) | |
Merge branch 'refs/heads/siacs/master' into welcome-screen
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 8eca26e04..2fee7211d 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -37,6 +37,7 @@ public final class Config { public static final String LOGTAG = "conversations"; public static final String DOMAIN_LOCK = "pix-art.de"; //only allow account creation for this domain + public static final String MAGIC_CREATE_DOMAIN = "pix-art.de"; public static final String CONFERENCE_DOMAIN_LOCK = null; //only allow conference creation for this domain public static final boolean LOCK_DOMAINS_IN_CONVERSATIONS = false; //only add contacts and conferences for own domains public static final boolean LOCK_SETTINGS = false; //set to true to disallow account and settings editing |