diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-02-01 16:12:20 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-01 16:12:20 +0100 |
commit | e87bd6d94ad3d9ae85adc48dae9b84e961385404 (patch) | |
tree | c7bcb2d7a1403af5457e8a6f47f424c83983676a /Gemfile.lock | |
parent | f611da489929d2592b61b0c0f7c870ae33782343 (diff) | |
parent | 3de63b3c351c7584e911b4839dff6395d2ccb5ec (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ce961afa8..76bcdeda5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -271,7 +271,7 @@ GEM httplog (1.2.0) rack (>= 1.0) rainbow (>= 2.0.0) - i18n (1.5.2) + i18n (1.5.3) concurrent-ruby (~> 1.0) i18n-tasks (0.9.28) activesupport (>= 4.0.2) @@ -457,7 +457,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.2) + rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) rails-settings-cached (0.6.6) |