← Back to branch summary

~dhis2-academy/dhis2-academy/spring-mvc

~dhis2-academy/dhis2-academy/spring-mvc

Viewing all changes in revision 2495.

Committer: Henrik Wingerei
Date: 2010-12-10 15:35:30 UTC
mfrom: (2459.2.4 spring-mvc)
Revision ID: henriwi@ifi.uio.no-20101210153530-fre8r02ud2nh7pcy

Merging

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/factory/I18nFactoryBean.java

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationController.java

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/useraccount/action/GetCurrentUserController.java

Show diffs side-by-side

added added

removed removed

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/about/action/AboutController.java

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/factory/I18nFactoryBean.java

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationController.java

dhis-2/dhis-web/dhis-web-commons-spring-mvc/src/main/java/org/hisp/dhis/useraccount/action/GetCurrentUserController.java

Older »