From a95d7092eb3bf4e02cbd1aabc31548462d6376c2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Aug 2018 15:27:48 -0600
Subject: [PATCH] Changelog

---
 changelogs/client_server/newsfragments/1550.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelogs/client_server/newsfragments/1550.feature

diff --git a/changelogs/client_server/newsfragments/1550.feature b/changelogs/client_server/newsfragments/1550.feature
new file mode 100644
index 000000000..f04fa9ae0
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1550.feature
@@ -0,0 +1 @@
+Add server ACLs as an option for controlling federation in a room.