Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2014-10-03 11:52:35 +02:00
commit b155b25555

View File

@ -3,7 +3,7 @@
$(function (){ $(function (){
if (ripples) { if (ripples) {
ripples.init(".btn:not(.btn-link), .navbar a, .nav-tabs a, .withripple"); ripples.init(".btn:not(.btn-link), .navbar a:not(.withoutripple), .nav-tabs a:not(.withoutripple), .withripple");
} }
var initInputs = function() { var initInputs = function() {