gitlab-org--gitlab-foss/app/assets/javascripts/merge_conflicts
Brandon Labuschagne 7f75ac0ce8 Internationalisation of merge_conflicts directory
This is one of many MRs opened in order to improve the overall
internationalisation of the GitLab codebase.

i18n documentation
https://docs.gitlab.com/ee/development/i18n/externalization.html
2019-05-02 13:07:34 +00:00
..
components Add .code to all tables holding diffs 2019-03-26 14:35:43 +01:00
mixins Removes merge conflicts vue code from globalnamespace 2018-06-13 12:35:32 +01:00
merge_conflict_service.js Removes merge conflicts vue code from globalnamespace 2018-06-13 12:35:32 +01:00
merge_conflict_store.js Internationalisation of merge_conflicts directory 2019-05-02 13:07:34 +00:00
merge_conflicts_bundle.js Internationalisation of merge_conflicts directory 2019-05-02 13:07:34 +00:00