Merge branch '2.3'

Browse Source

...

This commit is contained in:

James Brooks

2016-07-12 09:37:11 +01:00

parent 7d4bab478f 99dbc2cd6c

commit 83e1013771

42 changed files with 0 additions and 0 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

bootstrap/cache/.gitignore

Executable → Regular

config/langs.php

Executable → Regular

public/build/dist/css/all-81fdbf996d.css

Vendored Executable → Regular

public/img/apple-touch-icon-114x114.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 4.8 KiB

public/img/apple-touch-icon-120x120.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

public/img/apple-touch-icon-144x144.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.4 KiB After Width:  |  Height:  |  Size: 6.4 KiB

public/img/apple-touch-icon-152x152.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.3 KiB After Width:  |  Height:  |  Size: 7.3 KiB

public/img/apple-touch-icon-57x57.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

public/img/apple-touch-icon-72x72.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.9 KiB

public/img/apple-touch-icon-76x76.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.2 KiB

public/img/apple-touch-icon.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

public/img/favicon-high-alert.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 4.8 KiB

public/img/favicon-medium-alert.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 4.8 KiB

resources/assets/js/app.js

Executable → Regular

resources/assets/sass/_errors.scss

Vendored Executable → Regular

resources/assets/sass/_helpers.scss

Vendored Executable → Regular

resources/assets/sass/_palette.scss

Vendored Executable → Regular

resources/assets/sass/_status-page.scss

Vendored Executable → Regular

resources/assets/sass/app.scss

Vendored Executable → Regular

resources/assets/sass/modules/_bootstrap.scss

Vendored Executable → Regular

resources/assets/sass/modules/_forms.scss

Vendored Executable → Regular

resources/assets/sass/modules/_tabs.scss

Vendored Executable → Regular

resources/assets/sass/modules/_variables.scss

Vendored Executable → Regular

resources/assets/sass/modules/_well.scss

Vendored Executable → Regular

resources/assets/sass/pages/_dashboard.scss

Vendored Executable → Regular

resources/assets/sass/pages/_login.scss

Vendored Executable → Regular

resources/assets/sass/pages/_setup.scss

Vendored Executable → Regular

resources/assets/sass/partials/_base.scss

Vendored Executable → Regular

resources/assets/sass/partials/_content.scss

Vendored Executable → Regular

resources/assets/sass/partials/_modals.scss

Vendored Executable → Regular

resources/assets/sass/partials/_navbar.scss

Vendored Executable → Regular

resources/assets/sass/partials/_sidebar.scss

Vendored Executable → Regular

resources/assets/sass/partials/_wrapper.scss

Vendored Executable → Regular

resources/assets/sass/plugins/_animate.scss

Vendored Executable → Regular

resources/assets/sass/plugins/_messenger.scss

Vendored Executable → Regular

resources/assets/sass/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.scss

Vendored Executable → Regular

storage/app/.gitignore

Executable → Regular

storage/framework/.gitignore

Executable → Regular

storage/framework/cache/.gitignore

Executable → Regular

storage/framework/sessions/.gitignore

Executable → Regular

storage/framework/views/.gitignore

Executable → Regular

storage/logs/.gitignore

Executable → Regular