Anuken 302ae0a83c Merge remote-tracking branch 'origin/4.0' into 4.0 ... # Conflicts: # core/assets/bundles/bundle_ko.properties		2018-07-13 13:48:52 -04:00
..
bundle_de.properties
bundle_es.properties
bundle_fr.properties
bundle_in_ID.properties
bundle_ita.properties
bundle_ko.properties	Merge remote-tracking branch 'origin/4.0' into 4.0	2018-07-13 13:48:52 -04:00
bundle_pl.properties
bundle_pt_BR.properties
bundle_ru.properties
bundle_tk.properties
bundle_uk_UA.properties
bundle.properties