summary refs log tree commit diff
path: root/synapse/config/__init__.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-29 15:01:52 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-29 15:01:52 +0100
commit7c0224d5c051bf6fb34cb372bb6aae928de4bc78 (patch)
tree57b7119644911027d4a73047412068bb002d7cb0 /synapse/config/__init__.py
parentCode formatting (Black) (diff)
parentMerge branch 'develop' into rei/rss_target (diff)
downloadsynapse-7c0224d5c051bf6fb34cb372bb6aae928de4bc78.tar.xz
Merge branch 'rei/rss_target' into rei/rss_inc6
Diffstat (limited to 'synapse/config/__init__.py')
-rw-r--r--synapse/config/__init__.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/config/__init__.py b/synapse/config/__init__.py
index f2a5a41e92..1e76e9559d 100644
--- a/synapse/config/__init__.py
+++ b/synapse/config/__init__.py
@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ._base import ConfigError
+from ._base import ConfigError, find_config_files
 
-# export ConfigError if somebody does import *
+# export ConfigError and find_config_files if somebody does
+# import *
 # this is largely a fudge to stop PEP8 moaning about the import
-__all__ = ["ConfigError"]
+__all__ = ["ConfigError", "find_config_files"]