about summary refs log tree commit diff
path: root/app/javascript/core
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-17 18:09:30 +0200
committerGitHub <noreply@github.com>2018-08-17 18:09:30 +0200
commit32075fe27f699d5a586e6ecf26c172550f9d4086 (patch)
tree61f48fa2dee608f72990f76a8f0497d670339252 /app/javascript/core
parent4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff)
parenta16ff45d81d77d93f33ad57e746c780392ab1a1c (diff)
Merge pull request #642 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/core')
-rw-r--r--app/javascript/core/admin.js3
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/core/admin.js b/app/javascript/core/admin.js
index 3302454ab..28f27fbc6 100644
--- a/app/javascript/core/admin.js
+++ b/app/javascript/core/admin.js
@@ -1,9 +1,6 @@
 //  This file will be loaded on admin pages, regardless of theme.
 
 import { delegate } from 'rails-ujs';
-import { start } from '../mastodon/common';
-
-start();
 
 function handleDeleteStatus(event) {
   const [data] = event.detail;