From e6712185a2718bc73bf6201aee4e3034cdf6a674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 22 Jun 2015 15:40:54 +0200
Subject: [PATCH] bump listen
---
Changelog.md | 1 +
Gemfile.lock | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Changelog.md b/Changelog.md
index 1a1114d587..d86dc3669b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@
* Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
* Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110)
* Add link to pod statistics in right navigation [#6117](https://github.com/diaspora/diaspora/pull/6117)
+* Update to Rails 4.2.3 [#6140](https://github.com/diaspora/diaspora/pull/6140)
## Bug fixes
* Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)
diff --git a/Gemfile.lock b/Gemfile.lock
index e613a26396..9638db539c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -394,7 +394,7 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
- listen (2.10.0)
+ listen (2.10.1)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
--
GitLab