Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Matt <lukas@zauberstuhl.de>2016-09-13 00:34:24 +0300
committerSteffen van Bergerem <svbergerem@online.de>2016-09-18 14:35:45 +0300
commit9c93691b8af61a7b5a7e452dd3c3857709e020e5 (patch)
tree2218fb4b7e618f670debae353ec7d690cfa7a829 /app/assets
parentdc1bc753039c7435149afee029c039ff9f8b45a2 (diff)
bump diaspora_jsxc to v0.1.5-develop.7
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de> closes #7095
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/jsxc.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index d2774dafb..9209fd7bf 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -1,7 +1,12 @@
+//= require emojione
+//= require favico.js
+
+//= require jquery.ui/ui/resizable
+//= require jquery.ui/ui/draggable
//= require jquery.slimscroll/jquery.slimscroll
//= require jquery-colorbox
-//= require favico.js
//= require jquery-fullscreen-plugin
+
//= require diaspora_jsxc
// initialize jsxc xmpp client