Include CHANGES info for r405553

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@405585 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 8bd6cd037275daf10c5b8f44245eb881db8db514..000390c8913df03e86eea58f09149485540406ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,12 +12,19 @@
 --- Functionality changes from Asterisk 12.0.0 to Asterisk 12.1.0 ------------
 ------------------------------------------------------------------------------
 
+ARI
+------------------
+ * Added a new ARI resource 'mailboxes' which allows the creation and
+   modification of mailboxes managed by external MWI. Modules res_mwi_external
+   and res_stasis_mailbox must be enabled to use this resource.
+
 chan_pjsip
 ------------------
  * Path support has been added with the 'support_path' option in registration
    and aor sections.
 
 ------------------------------------------------------------------------------
+>>>>>>> .r405584
 --- Functionality changes from Asterisk 11 to Asterisk 12 --------------------
 ------------------------------------------------------------------------------