nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6393 from pravi/patch-2

Browse source 
switch back to jquery-colorbox
This commit is contained in:
Jason Robinson 2015-10-10 21:10:08 +02:00
commit dd5409dce3
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/jsxc.js
View file

@ -1,5 +1,5 @@
//= require jquery.slimscroll //= require jquery.slimscroll
//= require colorbox //= require jquery-colorbox
//= require favico.js //= require favico.js
//= require jquery-fullscreen-plugin //= require jquery-fullscreen-plugin
//= require diaspora_jsxc //= require diaspora_jsxc

1
app/assets/stylesheets/_application.scss
View file

@ -78,7 +78,6 @@
@import 'stream'; @import 'stream';
@import 'stream_element'; @import 'stream_element';
@import 'comments'; @import 'comments';
@import 'colorbox';
@import 'diaspora_jsxc'; @import 'diaspora_jsxc';
@import 'chat'; @import 'chat';
@import 'markdown-content'; @import 'markdown-content';