Merge branch 'master' into development

2016-10-29 16:22:12 -04:00
parent 6b6a238039 f978bd4982
commit 1e50676f11
660 changed files with 7238 additions and 7324 deletions
--- a/docs/releases/2.1.4.rst
+++ b/docs/releases/2.1.4.rst
@@ -2,7 +2,7 @@
 Mayan EDMS v2.1.4 release notes
 ===============================

-Released: XX, 2016
+Released: October 28, 2016

 What's new
 ==========
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -22,7 +22,6 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
   :maxdepth: 1

-=======
   2.2
   2.1.4
   2.1.3