← Back to branch summary

~dhis2-devs-core/dhis2/alerts

~dhis2-devs-core/dhis2/alerts

Viewing all changes in revision 11878.

Committer: dhis2-c
Date: 2013-09-26 11:03:55 UTC
mfrom: (11862.1.387 dhis2)
Revision ID: dhis2@jamesgrace.org-20130926110355-8k05o626yjk1oi6i

Merge w trunk

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonIdentifierController.java

files modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EnrollmentController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/ProgramController.java

Show diffs side-by-side

added added

removed removed

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EnrollmentController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonAttributeController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/PersonIdentifierController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/ProgramController.java

Older »