Merge remote-tracking branch 'upstream/master'

2016-02-11 22:03:05 -05:00
parent a2d7278d61 3a529da68a
commit 6ac648f033
42 changed files with 348 additions and 71 deletions
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -33,3 +33,6 @@ tramp

 # Flycheck
 flycheck_*.el
+
+# server auth directory
+/server/