logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 1245ee42fb9f689ffa4956f42f44a7ab75e19075
parent: 98de6927f39f5d0cd6637779c76da016dc510769
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 19 Sep 2016 23:52:42 +0200

Update OStatus2 library

Diffstat:

MGemfile.lock4++--
Rapp/assets/javascripts/components/features/ui/components/media_gallery.jsx -> app/assets/javascripts/components/components/media_gallery.jsx0
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock @@ -87,7 +87,7 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160615) + domain_name (0.5.20160826) unf (>= 0.0.5, < 1.0.0) doorkeeper (4.2.0) railties (>= 4.2) @@ -171,7 +171,7 @@ GEM pkg-config (~> 1.1.7) oj (2.17.3) orm_adapter (0.5.0) - ostatus2 (0.1.1) + ostatus2 (0.2) addressable (~> 2.4) http (~> 1.0) nokogiri (~> 1.6) diff --git a/app/assets/javascripts/components/features/ui/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx