genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2016-12-26 15:14:23 +01:00
commit 1a6e995262
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -6,7 +6,7 @@
"type": "project", "type": "project",
"require": { "require": {
"smarty/smarty": "~3.1.29", "smarty/smarty": "~3.1.29",
"slim/slim": "~3.6.0", "slim/slim": "~3.7.0",
"mathmarques/smarty-view": "~1.1.0", "mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.2.0", "symfony/yaml": "~3.2.0",
"symfony/process": "~3.2.0", "symfony/process": "~3.2.0",

16
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "7e2dc259a435b944643699141b2a9344", "hash": "4493f6542773480e0317a90a2de2f82e",
"content-hash": "736c2be881e2080b6e3c3fe770016737", "content-hash": "73c835f77628ac1e77dee70447711759",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -689,16 +689,16 @@
}, },
{ {
"name": "slim/slim", "name": "slim/slim",
"version": "3.6.0", "version": "3.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/slimphp/Slim.git", "url": "https://github.com/slimphp/Slim.git",
"reference": "a685fe91a9435e1432e8eeb7cf516e2f5cee7f64" "reference": "4254e40d81559e35cdf856bcbaca5f3af468b7ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/a685fe91a9435e1432e8eeb7cf516e2f5cee7f64", "url": "https://api.github.com/repos/slimphp/Slim/zipball/4254e40d81559e35cdf856bcbaca5f3af468b7ef",
"reference": "a685fe91a9435e1432e8eeb7cf516e2f5cee7f64", "reference": "4254e40d81559e35cdf856bcbaca5f3af468b7ef",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -748,14 +748,14 @@
} }
], ],
"description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
"homepage": "http://slimframework.com", "homepage": "https://slimframework.com",
"keywords": [ "keywords": [
"api", "api",
"framework", "framework",
"micro", "micro",
"router" "router"
], ],
"time": "2016-11-20 20:48:49" "time": "2016-12-20 20:30:47"
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",