← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 35c8c4: Merge pull request #53 from dhis2/docinprogress

 

  Branch: refs/heads/docinprogress
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 35c8c4a526aeacc33621658e071f2c95b287d289
      https://github.com/dhis2/dhis2-docs/commit/35c8c4a526aeacc33621658e071f2c95b287d289
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

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

Merge latest changes on Docinprogress in master


  Commit: 1b6e9fec8a291e1b48af48c94e0f57996a86be39
      https://github.com/dhis2/dhis2-docs/commit/1b6e9fec8a291e1b48af48c94e0f57996a86be39
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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


  Commit: 68c3d879d0525315362b6b397d9398c7083a9ddc
      https://github.com/dhis2/dhis2-docs/commit/68c3d879d0525315362b6b397d9398c7083a9ddc
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  -----------
  Man app: data sets - added changes from corrupt commit

Commits
679575beef75514fd682eca150d889814eb95a33
6bc9fc74e68a20a920553e37bcd056c11af9c01a


Compare: https://github.com/dhis2/dhis2-docs/compare/7122d6bf7d55...68c3d879d052