cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Merge 2.7.1 #7

Merged
chr merged 18 commits from upstream-2.7.1 into cybrespace 2019-02-11 00:49:05 +01:00
Conversation 0 Commits 18 Files Changed 18 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd8a00a3cc - Show all commits

4
Gemfile.lock
View File

@ -290,8 +290,8 @@ GEM
json-ld (3.0.2) json-ld (3.0.2)
multi_json (~> 1.12) multi_json (~> 1.12)
rdf (>= 2.2.8, < 4.0) rdf (>= 2.2.8, < 4.0)
json-ld-preloaded (3.0.0) json-ld-preloaded (3.0.2)
json-ld (>= 2.2, < 4.0) json-ld (~> 3.0)
multi_json (~> 1.12) multi_json (~> 1.12)
rdf (~> 3.0) rdf (~> 3.0)
jsonapi-renderer (0.2.0) jsonapi-renderer (0.2.0)