Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revision-diff.txt (8.89 KB)
···
------------------------------------------------------------
revno: 16530 [merge]
committer: Jan Henrik Overland <janhenrik.overland@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-08-26 20:28:11 +0200
message:
User setting: analysis display property. Work in progress.
removed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_ar.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_pt.properties
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress