summaryrefslogtreecommitdiff
path: root/locale/es
diff options
context:
space:
mode:
authorRuben Davila <rdavila84@gmail.com>2017-05-04 18:51:18 -0500
committerRuben Davila <rdavila84@gmail.com>2017-05-04 18:51:18 -0500
commit7fd42698aae14c8d0a064716f90274f1de54e496 (patch)
tree552d6f47cde2ab29571b09fdc5a97c3b1dc70ee6 /locale/es
parentb396668ec55fb866ef578e5f0e60df8b13519613 (diff)
parentbacf652a3794c4da71312982b7617542363c1441 (diff)
downloadgitlab-ce-7fd42698aae14c8d0a064716f90274f1de54e496.tar.gz
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
Diffstat (limited to 'locale/es')
0 files changed, 0 insertions, 0 deletions