summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorRuben Davila <rdavila84@gmail.com>2017-04-24 22:37:49 -0500
committerRuben Davila <rdavila84@gmail.com>2017-04-24 22:37:49 -0500
commit64aadef375a524f7b3041c6dccb75c1f9689069f (patch)
treebde8ba90fdcf86c760a2fd7d685973fd64d134e4 /VERSION
parent77d9e3f9b49821af3ec9b4fbac574c75b02d0351 (diff)
parent4f31d5963f44b1803fa54d0732cae86b0ec45e06 (diff)
downloadgitlab-ce-64aadef375a524f7b3041c6dccb75c1f9689069f.tar.gz
Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page
Conflicts: config/initializers/gettext_rails_i18n_patch.rb
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions