2 files changed, 7 insertions, 0 deletions
diff --git a/Swift/Controllers/SettingConstants.cpp b/Swift/Controllers/SettingConstants.cpp
index 5347d4e..1191c28 100644
--- a/Swift/Controllers/SettingConstants.cpp
+++ b/Swift/Controllers/SettingConstants.cpp
@@ -25,5 +25,6 @@ const SettingsProvider::Setting<std::string> SettingConstants::INVITE_AUTO_ACCEP
 const SettingsProvider::Setting<bool> SettingConstants::DISCONNECT_ON_CARD_REMOVAL("disconnectOnCardRemoval", true);
 const SettingsProvider::Setting<bool> SettingConstants::SINGLE_SIGN_ON("singleSignOn", false);
 const SettingsProvider::Setting<bool> SettingConstants::MUC_MARKING_ELISION("mucMarkingElision", true);
+const SettingsProvider::Setting<bool> SettingConstants::FUTURE("future", false);
 
 }
diff --git a/Swift/Controllers/SettingConstants.h b/Swift/Controllers/SettingConstants.h
index 61781e0..f82dfb5 100644
--- a/Swift/Controllers/SettingConstants.h
+++ b/Swift/Controllers/SettingConstants.h
@@ -104,5 +104,11 @@ namespace Swift {
              * have their markings stripped.
              */
             static const SettingsProvider::Setting<bool> MUC_MARKING_ELISION;
+
+            /**
+             * The #FUTURE setting enables use of experimental features
+             * planned for future releases.
+             */
+            static const SettingsProvider::Setting<bool> FUTURE;
     };
 }