Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aios committed Aug 12, 2018
2 parents 9e31628 + 5ea44c4 commit f7a12e4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
## Laravel Admin Panel

[![Build Status](https://travis-ci.org/LaravelRUS/SleepingOwlAdmin.svg?branch=master)](https://travis-ci.org/LaravelRUS/SleepingOwlAdmin)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/LaravelRUS/SleepingOwlAdmin/badges/quality-score.png?b=development)](https://scrutinizer-ci.com/g/LaravelRUS/SleepingOwlAdmin/?branch=development)
[![StyleCI](https://styleci.io/repos/52141393/shield?branch=master)](https://styleci.io/repos/52141393)
[![Laravel Support](https://img.shields.io/badge/Laravel-5.5--5.6-brightgreen.svg)]()
[![PHP Support](https://img.shields.io/badge/PHP-7.x-brightgreen.svg)]()

[![Official Site](https://img.shields.io/badge/official-site-blue.svg)](https://sleepingowl.ru)
[![Demo Site](https://img.shields.io/badge/demo-site-blue.svg)](https://demo.sleepingowl.ru)
[![Join the chat at https://gitter.im/LaravelRUS/SleepingOwlAdmin](https://img.shields.io/badge/gitter-chat-yellowgreen.svg)](https://gitter.im/LaravelRUS/SleepingOwlAdmin)
[![Telegram Chat](https://img.shields.io/badge/telegram-chat-blue.svg)](https://t.me/prtcls)
[![Latest Stable Version](https://poser.pugx.org/laravelrus/sleepingowl/v/stable)](https://packagist.org/packages/laravelrus/sleepingowl)
[![Total Downloads](https://poser.pugx.org/laravelrus/sleepingowl/downloads)](https://packagist.org/packages/laravelrus/sleepingowl)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
},
"extra": {
"branch-alias": {
"dev-development": "4.x-dev",
"dev-new": "4.x-new"
"dev-master": "latest",
"dev-development": "development"
},
"laravel": {
"providers": [
Expand Down
1 change: 1 addition & 0 deletions src/Console/Installation/stubs/provider.stub
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class AdminSectionsServiceProvider extends ServiceProvider
/**
* Register sections.
*
* @param \SleepingOwl\Admin\Admin $admin
* @return void
*/
public function boot(\SleepingOwl\Admin\Admin $admin)
Expand Down

0 comments on commit f7a12e4

Please sign in to comment.