Merge branch 'saas-dev' into saas-dev-publishing
Conflicts: airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
commit
5bd8a508b1
8 changed files with 43 additions and 12 deletions
|
@ -550,7 +550,7 @@ var AIRTIME = (function(AIRTIME) {
|
|||
"bProcessing": true,
|
||||
"bServerSide": true,
|
||||
|
||||
"aLengthMenu": [5, 10, 15, 20, 25, 50, 100],
|
||||
"aLengthMenu": [25, 50, 100],
|
||||
|
||||
"bStateSave": true,
|
||||
"fnStateSaveParams": function (oSettings, oData) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue