Merge authors:
Stian Sandvold (stian-sandvold)
revision-diff.txt (2.57 KB)
···
------------------------------------------------------------
revno: 21605 [merge]
committer: Stian Sandvold <stian.sandvold@gmail.com>
branch nick: dhis2
timestamp: Tue 2016-01-05 19:42:24 +0100
message:
Fixed a minor bug caused by a rename; codestyle fixes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/EncryptionStatus.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.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