← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 0b5f8b: Merge remote-tracking branch 'dhis2/master' into d...

 

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 0b5f8bc6961567c59ffc6f798b60dcd2a013b31f
      https://github.com/dhis2/dhis2-docs/commit/0b5f8bc6961567c59ffc6f798b60dcd2a013b31f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-06 (Fri, 06 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_implementation_guide_installation.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'dhis2/master' into dhis2/docinprogress


  Commit: 64f7030f257c96f8f407cd378edae39d0aba277b
      https://github.com/dhis2/dhis2-docs/commit/64f7030f257c96f8f407cd378edae39d0aba277b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_implementation_guide_installation.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'dhis2/master' into dhis2/docinprogress


  Commit: 364b703746233e0c3e729bf0cd66535bd5027617
      https://github.com/dhis2/dhis2-docs/commit/364b703746233e0c3e729bf0cd66535bd5027617
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Log Message:
  -----------
  Merge branch 'Test--create-new-folders-and-topic-template' into dhis2/docinprogress


  Commit: a3cbffa840ed69e67c8d4fbb60ed6c4144c59e55
      https://github.com/dhis2/dhis2-docs/commit/a3cbffa840ed69e67c8d4fbb60ed6c4144c59e55
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_tracker.xml
    A src/docbkx/en/resources/content/topictemplate.xml
    A src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml

  Log Message:
  -----------
  Test


  Commit: d4b7c41b4ea97b6dbe0d0d5e3998548ed26f01c9
      https://github.com/dhis2/dhis2-docs/commit/d4b7c41b4ea97b6dbe0d0d5e3998548ed26f01c9
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_tracker.xml
    A src/docbkx/en/resources/content/topictemplate.xml
    A src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml

  Log Message:
  -----------
  Merge pull request #1 from ceciliapersson/Test--create-new-folders-and-topic-template

Test


  Commit: 5c2e45f7e29ebf72ffb16294de72f7f40dcc0292
      https://github.com/dhis2/dhis2-docs/commit/5c2e45f7e29ebf72ffb16294de72f7f40dcc0292
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_tracker.xml
    A src/docbkx/en/resources/content/topictemplate.xml
    A src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml

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

Dhis2/docinprogress


Compare: https://github.com/dhis2/dhis2-docs/compare/5fb32bce1ffd...5c2e45f7e29e