Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.2.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
This commit is contained in:
denise 2012-11-07 11:21:36 -05:00
commit b817684972
33 changed files with 167 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/js/bootstrap/bootstrap.js vendored
View file

@ -715,7 +715,7 @@
* =================================== */
$(document)
//menu options don't work on tablet so trying this hack for now:
// menu options don't work on tablet so trying this hack for now:
// https://github.com/twitter/bootstrap/issues/4550
//.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', clearMenus)