← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] c26f92: Merge pull request #73 from dhis2/mtn-restructure

 

  Branch: refs/heads/mtn-restructure
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: c26f92d0cab42960c62afa2eb97f0a9efc55366f
      https://github.com/dhis2/dhis2-docs/commit/c26f92d0cab42960c62afa2eb97f0a9efc55366f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_data_element.xml
    A src/docbkx/en/content/maintenance/mtn_data_set.xml
    A src/docbkx/en/content/maintenance/mtn_indicator.xml
    A src/docbkx/en/content/maintenance/mtn_org_unit.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    A src/docbkx/en/content/templates/template_feature.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  Merge pull request #73 from dhis2/mtn-restructure

New test to merge mtn structure


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

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


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

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_attribute.xml
    M src/docbkx/en/content/maintenance/mtn_constant.xml
    M src/docbkx/en/content/maintenance/mtn_data_element.xml
    M src/docbkx/en/content/maintenance/mtn_data_set.xml
    M src/docbkx/en/content/maintenance/mtn_indicator.xml
    M src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_org_unit.xml

  Log Message:
  -----------
  Mtn app new structure- retest of image links


Compare: https://github.com/dhis2/dhis2-docs/compare/042461abaa86...049bc8d0d6dc