• Nicolas Widart's avatar
    Merge branch '2.0' · 987981c9
    Nicolas Widart authored
    * 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
    987981c9
Name
Last commit
Last update
.github Loading commit data...
Modules Loading commit data...
Themes Loading commit data...
app Loading commit data...
bootstrap Loading commit data...
config Loading commit data...
database Loading commit data...
public Loading commit data...
resources Loading commit data...
routes Loading commit data...
storage Loading commit data...
tests Loading commit data...
.env.example Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.php_cs.dist Loading commit data...
.travis.yml Loading commit data...
artisan Loading commit data...
composer.json Loading commit data...
gulpfile.js Loading commit data...
package.json Loading commit data...
phpunit.xml Loading commit data...
readme.md Loading commit data...
server.php Loading commit data...
travis.sh Loading commit data...