Commit 7e034a7f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'

Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'"

This reverts commit bc12750f, reversing
changes made to 8a04b84e.

See merge request !2285
parents 561acdeb 770517d3
......@@ -13,6 +13,7 @@
#= require jquery.waitforimages
#= require jquery.atwho
#= require jquery.scrollTo
#= require jquery.blockUI
#= require jquery.turbolinks
#= require d3
#= require cal-heatmap
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment