Branch: refs/heads/docinprogress
Home: https://github.com/dhis2/dhis2-docs
Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
Author: Cecilia Persson <ceci...@dhis2.org>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: bddc95ac14d4c6155d469f02de12110c7378d163
https://github.com/dhis2/dhis2-docs/commit/bddc95ac14d4c6155d469f02de12110c7378d163
Author: Cecilia Persson <ceci...@dhis2.org>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/docinprogress' into docinprogress
Compare: https://github.com/dhis2/dhis2-docs/compare/9fbb4433b527...bddc95ac14d4_______________________________________________
Mailing list: https://launchpad.net/~dhis2-documenters
Post to : dhis2-documenters@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-documenters
More help : https://help.launchpad.net/ListHelp
