Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2021-09-21 21:25:39 -07:00
commit 0411f63591

View file

@ -51,7 +51,7 @@
paginationLastText: "{{ trans('general.last') }}",
paginationPreText: "{{ trans('general.previous') }}",
paginationNextText: "{{ trans('general.next') }}",
pageList: ['10','20', '30','50','100','150','200', '500'],
pageList: ['10','20', '30','50','100','150','200', '500', '100'],
pageSize: {{ (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
paginationVAlign: 'both',
queryParams: function (params) {