* 2.0:
  Update php-cs-fixer configuration file to use v2
  Adding changelog item for adminlte theme
  Preparing 2.4.0 changelog for adminlte theme
  Updating and compiling assets
  Migrate Adminlte theme to laravel mix
  Preparing 2.4 changelog for media
  Creating a @thumbnail blade directive
  Preparing the user changelog
  Show build status on 2.0 branch
  Move build icon at start
  Using a flat badge
  Adding back a proper readme file

# Conflicts:
#	Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.0/MIT-LICENSE.txt
#	Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.1/MIT-LICENSE.txt
#	Themes/Adminlte/changelog.yml
#	public/themes/adminlte/vendor/sisyphus/vendor/jasmine/MIT.LICENSE
#	readme.md

* adminlte and laravel mix

* Remove wrong dependency

* adminlte and laravel mix

* Remove wrong dependency

* master:
  Using field name for both Media Blade Directives (#337)

* Update MediaSingleDirective.php

* Update MediaMultipleDirective.php

* Update new-file-link-single.blade.php

* Update new-file-link-multiple.blade.php