conflict resolve

Browse Source

- added "Fix Select2 heights" #2178
- rebuild dist files & synced to docs

...

This commit is contained in:

REJack

2019-07-29 21:37:35 +02:00

parent 8845f6a8e5

commit 14f59c34f2

17 changed files with 62 additions and 63 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

dist/css/adminlte.css.map vendored

File diff suppressed because one or more lines are too long