=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-11-14 08:56:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-11-17 17:36:35 +0000 @@ -627,6 +627,7 @@ burkina_faso burkina_faso_coat_of_arms cambodia + cameroon china colombia congo_brazzaville === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/cameroon.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/cameroon.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/cameroon.png 2013-11-17 17:36:35 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-10-29 09:37:23 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-11-17 17:36:35 +0000 @@ -677,6 +677,7 @@ burkina_faso=Burkina Faso burkina_faso_coat_of_arms=Burkina Faso Coat of Arms cambodia=Cambodia +cameroon=Cameroon china=China colombia=Colombia congo_brazzaville=Republic of the Congo