Merge branch 'master' into overlay-menu-pos

jsk-ros-pkg · Feb 26, 2020 · ffe75df · ffe75df
2 parents b87b597 + 0210a67
commit ffe75df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis b/.travis
diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -1,3 +1,4 @@
-sphinx
-sphinx-autobuild
-recommonmark
+recommonmark==0.5.0
+Sphinx==1.8.4
+sphinx-markdown-tables==0.0.9
+sphinx_rtd_theme==0.4.3
+5 −0		.travis.yml
+42 −0		CHANGELOG.rst
+5 −0		CMakeLists.txt
+6 −0		README.md
+4 −0		docker.sh
+1 −1		package.xml
+17 −0		test/test_env_var.py
+33 −5		travis.sh
+31 −2		travis_jenkins.py