Merge branch '2.3' into 2.7

xabbuh · xabbuh · commit 88f0238019a9 · 2016-03-30T17:44:24.000+02:00
* 2.3:
  stick to Sphinx 1.3.x for the moment
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ cache:
         - $HOME/.cache/pip
         - _build
 
-install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git
+install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
 
 script: sphinx-build -nW -b html -d _build/doctrees . _build/html
 
