tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	spec/views/about/show.html.haml_spec.rb
This commit is contained in:
David Yip
2018-04-04 13:56:58 -05:00
parent bda1782cd8 1c1042556d
commit 3ab6a8b8be
9 changed files with 174 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yarn.lock
View File

@@ -3100,10 +3100,6 @@ gzip-size@^3.0.0:
dependencies:
duplexer "^0.1.1"
hammerjs@^2.0.8:
version "2.0.8"
resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
handle-thing@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"