← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 587987: Merge pull request #63 from dhis2/docinprogress

 

  Branch: refs/heads/docinprogress
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 587987c1a570b54c6536f5c7b8170b0fad23cc7a
      https://github.com/dhis2/dhis2-docs/commit/587987c1a570b54c6536f5c7b8170b0fad23cc7a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png

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

Merge latest updates on docinprogress with master


  Commit: 6dcb5355fdb776d386490861f4b5b2b5ea9ca5ef
      https://github.com/dhis2/dhis2-docs/commit/6dcb5355fdb776d386490861f4b5b2b5ea9ca5ef
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

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


Compare: https://github.com/dhis2/dhis2-docs/compare/d75d07a2344a...6dcb5355fdb7