← Back to team overview

dhis2-documenters team mailing list archive

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

 

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

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


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

  Changed paths:
    M src/docbkx/en/dhis2_user_man_indicators.xml

  Log Message:
  -----------
  Man app: Indicators - major edits and restructure


  Commit: 7c917aa1d2e8974ed6a92139fce856b0252e168e
      https://github.com/dhis2/dhis2-docs/commit/7c917aa1d2e8974ed6a92139fce856b0252e168e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

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

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


  Commit: 681acc8435d1bab3de375ef78fd8d8e2cf4e2c47
      https://github.com/dhis2/dhis2-docs/commit/681acc8435d1bab3de375ef78fd8d8e2cf4e2c47
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_gis.xml

  Log Message:
  -----------
  GIS: review of PR #57 and #55


  Commit: 232e1845531899a585234d2b6caca06b2bee8f4b
      https://github.com/dhis2/dhis2-docs/commit/232e1845531899a585234d2b6caca06b2bee8f4b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml

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

Merge review of PR #55 and #57 with master


Compare: https://github.com/dhis2/dhis2-docs/compare/ee090c05b493...232e18455318