diff options
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/components/components/media_gallery.jsx (renamed from app/assets/javascripts/components/features/ui/components/media_gallery.jsx) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7d43ec57c..b3cf207be 100644 --- 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 index 20f9a3d87..20f9a3d87 100644 --- a/app/assets/javascripts/components/features/ui/components/media_gallery.jsx +++ b/app/assets/javascripts/components/components/media_gallery.jsx |