aboutsummaryrefslogtreecommitdiffhomepage
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-11-03 16:41:29 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-11-03 16:41:29 +0100
commit5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch)
treea1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /Gemfile.lock
parentda4136557963018287cae61226e9006c3c741747 (diff)
parent84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff)
downloadwallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz
wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst
wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index aebbeba2..7b13b399 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,8 +29,9 @@ PLATFORMS
29 29
30DEPENDENCIES 30DEPENDENCIES
31 capistrano (~> 3.4) 31 capistrano (~> 3.4)
32 capistrano-composer (~> 0.0.3) 32 capistrano-composer
33 capistrano-file-permissions
33 capistrano-symfony (~> 1.0.0.rc1) 34 capistrano-symfony (~> 1.0.0.rc1)
34 35
35BUNDLED WITH 36BUNDLED WITH
36 1.11.2 37 1.13.5