mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-03-14 20:39:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source
This commit is contained in:
Graham Campbell 2015-08-14 22:38:38 +01:00
commit 4a22b1b053
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
composer.lock generated
View File

@ -1681,16 +1681,16 @@
},
{
"name": "laravel/framework",
"version": "v5.1.9",
"version": "v5.1.10",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2f1e0b8d7c24bb783d3a8d4fe4120ef82e5da648"
"reference": "d47ccc8de10ccb6f328cc90f901ca5e47e077c93"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2f1e0b8d7c24bb783d3a8d4fe4120ef82e5da648",
"reference": "2f1e0b8d7c24bb783d3a8d4fe4120ef82e5da648",
"url": "https://api.github.com/repos/laravel/framework/zipball/d47ccc8de10ccb6f328cc90f901ca5e47e077c93",
"reference": "d47ccc8de10ccb6f328cc90f901ca5e47e077c93",
"shasum": ""
},
"require": {
@ -1805,7 +1805,7 @@
"framework",
"laravel"
],
"time": "2015-08-05 12:51:18"
"time": "2015-08-12 18:16:08"
},
{
"name": "league/commonmark",
@ -3555,16 +3555,16 @@
},
{
"name": "phpspec/prophecy",
"version": "v1.4.1",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
"reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
"reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
"reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
"shasum": ""
},
"require": {
@ -3611,7 +3611,7 @@
"spy",
"stub"
],
"time": "2015-04-27 22:15:08"
"time": "2015-08-13 10:07:40"
},
{
"name": "phpunit/php-code-coverage",
@ -3806,16 +3806,16 @@
},
{
"name": "phpunit/php-token-stream",
"version": "1.4.3",
"version": "1.4.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
"reference": "09fc125d65c344c53a7c7ad8f261e3f3af9f76c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
"reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/09fc125d65c344c53a7c7ad8f261e3f3af9f76c5",
"reference": "09fc125d65c344c53a7c7ad8f261e3f3af9f76c5",
"shasum": ""
},
"require": {
@ -3851,20 +3851,20 @@
"keywords": [
"tokenizer"
],
"time": "2015-06-19 03:43:16"
"time": "2015-08-13 14:23:08"
},
{
"name": "phpunit/phpunit",
"version": "4.8.2",
"version": "4.8.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "748c6963c0a8c983fa69ee8884c885d0e98209bf"
"reference": "fd3050e26e3105f416d74c4d33aea659b406c59d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/748c6963c0a8c983fa69ee8884c885d0e98209bf",
"reference": "748c6963c0a8c983fa69ee8884c885d0e98209bf",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fd3050e26e3105f416d74c4d33aea659b406c59d",
"reference": "fd3050e26e3105f416d74c4d33aea659b406c59d",
"shasum": ""
},
"require": {
@ -3923,7 +3923,7 @@
"testing",
"xunit"
],
"time": "2015-08-07 12:56:50"
"time": "2015-08-10 09:16:56"
},
{
"name": "phpunit/phpunit-mock-objects",

2
resources/views/dashboard/partials/head.blade.php
View File

@ -20,7 +20,7 @@
<title>{{ isset($page_title) ? $page_title : Setting::get('app_name') }} | Cachet</title>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
@include('partials.crowdin')

2
resources/views/layout/error.blade.php
View File

@ -21,7 +21,7 @@
<title>{{ isset($page_title) ?: Setting::get('app_name') }}</title>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
@include('partials.stylesheet')

2
resources/views/layout/master.blade.php
View File

@ -37,7 +37,7 @@
<title>{{ $page_title }}</title>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
@include('partials.stylesheet')