summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-11 10:28:42 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-11 10:28:42 +0200
commit9f10943c1a76576ac40d96189a28a4d6123a75d8 (patch)
tree88955d92ebc98a4165d66a36cb8a2cf92709981a /Gemfile.lock
parent84727fba96c6794874e1f94d581408b70e1842a7 (diff)
downloadgitlab-ce-9f10943c1a76576ac40d96189a28a4d6123a75d8.tar.gz
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 643c513161f..53d21b26e97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -875,4 +875,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.10.4
+ 1.10.5