usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

# 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
parent 71509da660 9be8a187a7
commit 02be6a08f9
3 changed files with 0 additions and 6 deletions
Show Stats 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": "3.5.0",
"chai-http": "3.0.0", "chai-http": "3.0.0",
"chalk": "1.1.3", "chalk": "1.1.3",
"chart.js": "2.5.0",
"compression": "1.6.2", "compression": "1.6.2",
"cors": "2.8.1", "cors": "2.8.1",
"cropperjs": "1.0.0-beta", "cropperjs": "1.0.0-beta",

1
src/web/app/desktop/script.js
View File

@ -5,7 +5,6 @@
// Style // Style
import './style.styl'; import './style.styl';
require('chart.js');
require('./tags'); require('./tags');
const riot = require('riot'); const riot = require('riot');
const boot = require('../boot'); const boot = require('../boot');

4
src/web/app/desktop/tags/index.js
View File

@ -81,10 +81,6 @@ require('./sub-post-content.tag');
require('./images-viewer.tag'); require('./images-viewer.tag');
require('./image-dialog.tag'); require('./image-dialog.tag');
require('./donation.tag'); require('./donation.tag');
require('./user-posts-graph.tag');
require('./user-friends-graph.tag');
require('./user-likes-graph.tag');
require('./post-status-graph.tag');
require('./users-list.tag'); require('./users-list.tag');
require('./user-following.tag'); require('./user-following.tag');
require('./user-followers.tag'); require('./user-followers.tag');