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

1
package.json
View File

@ -55,7 +55,6 @@
"file-loader": "^0.11.2",
"font-awesome": "^4.7.0",
"glob": "^7.1.1",
"hammerjs": "^2.0.8",
"http-link-header": "^0.8.0",
"immutable": "^3.8.2",
"imports-loader": "^0.8.0",