dhis2-documenters team mailing list archive

Thread
Date

[dhis2/dhis2-docs] 41ffc5: Merge branch 'master' into docinprogress

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Wed, 29 Jun 2016 00:19:29 -0700
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 41ffc55464a0453e61f542ebada8c8b6c2171941
      https://github.com/dhis2/dhis2-docs/commit/41ffc55464a0453e61f542ebada8c8b6c2171941
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into docinprogress


  Commit: 8e662dd91594c150f9516f758b6607db9b8a089a
      https://github.com/dhis2/dhis2-docs/commit/8e662dd91594c150f9516f758b6607db9b8a089a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml

  Log Message:
  -----------
  Mtn app: new TOC cont.


  Commit: bb1255ff9cbfd382958b2e532c6650394282f344
      https://github.com/dhis2/dhis2-docs/commit/bb1255ff9cbfd382958b2e532c6650394282f344
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml

  Log Message:
  -----------
  Merge pull request #67 from dhis2/docinprogress

Merge latest updates on docinprogress with master


Compare: https://github.com/dhis2/dhis2-docs/compare/af194f89a0c3...bb1255ff9cbf