Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
Conflicts: airtime_mvc/public/js/airtime/common/common.js
This commit is contained in:
commit
12c4e4a374
18 changed files with 318 additions and 171 deletions
|
@ -206,4 +206,4 @@ $(document).mouseup(function (e) {
|
|||
if (!mb.is(e.target) && mb.has(e.target).length === 0 && w <= 970) {
|
||||
$('#nav').find('.responsive-menu').slideUp();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue