nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into stable

Browse source
This commit is contained in:
Dennis Schubert 2016-06-28 22:06:00 +02:00
commit 8cd3f31da6
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -6,6 +6,10 @@
## Features ## Features
# 0.5.10.1
We made a mistake and removed `mysql2` from the `Gemfile.lock` in a recent gem update. Since this could cause some issues for some installations, we decided to release a hotfix.
# 0.5.10.0 # 0.5.10.0
## Refactor ## Refactor

4
Gemfile.lock
View file

@ -474,6 +474,7 @@ GEM
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.4.4)
naught (1.1.0) naught (1.1.0)
nenv (0.3.0) nenv (0.3.0)
nested_form (0.3.2) nested_form (0.3.2)
@ -516,7 +517,6 @@ GEM
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (2.3.1.2) parser (2.3.1.2)
ast (~> 2.2) ast (~> 2.2)
pg (0.18.4)
phantomjs (2.1.1.0) phantomjs (2.1.1.0)
pkg-config (1.1.7) pkg-config (1.1.7)
powerpack (0.1.1) powerpack (0.1.1)
@ -846,6 +846,7 @@ DEPENDENCIES
mini_magick (= 4.5.1) mini_magick (= 4.5.1)
minitest minitest
mobile-fu (= 1.3.1) mobile-fu (= 1.3.1)
mysql2 (= 0.4.4)
nokogiri (= 1.6.8) nokogiri (= 1.6.8)
omniauth (= 1.3.1) omniauth (= 1.3.1)
omniauth-facebook (= 3.0.0) omniauth-facebook (= 3.0.0)
@ -853,7 +854,6 @@ DEPENDENCIES
omniauth-twitter (= 1.2.1) omniauth-twitter (= 1.2.1)
omniauth-wordpress (= 0.2.2) omniauth-wordpress (= 0.2.2)
open_graph_reader (= 0.6.1) open_graph_reader (= 0.6.1)
pg (= 0.18.4)
pry pry
pry-byebug pry-byebug
quiet_assets (= 1.1.0) quiet_assets (= 1.1.0)