Auto stash before merge of "master" and "origin/master"

isabella232 · Nov 4, 2017 · 0139e12 · 0139e12
1 parent e638cd4
commit 0139e12
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -4,8 +4,10 @@ setup.py
 O365/__init__.py
 O365/attachment.py
 O365/cal.py
+O365/connection.py
 O365/contact.py
 O365/event.py
+O365/fluent_inbox.py
 O365/group.py
 O365/inbox.py
 O365/message.py