profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls

Browse source 
# Conflicts:
#	src/web/app/desktop/tags/post-status-graph.tag
#	src/web/app/desktop/tags/user-friends-graph.tag
#	src/web/app/desktop/tags/user-likes-graph.tag
#	src/web/app/desktop/tags/user-posts-graph.tag
This commit is contained in:
syuilo 2017-02-20 14:43:01 +09:00
commit 02be6a08f9
3 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -74,7 +74,6 @@
"chai": "3.5.0",
"chai-http": "3.0.0",
"chalk": "1.1.3",
"chart.js": "2.5.0",
"compression": "1.6.2",
"cors": "2.8.1",
"cropperjs": "1.0.0-beta",