Skip to content

Commit

Permalink
Squashed 'src/Pingpong/Shortcode/' changes from 139ee0b..745f064
Browse files Browse the repository at this point in the history
745f064 Update header
148afda Merge branch 2.0
136e721 set minimum stability to dev
f3e3c43 Added support for Laravel 5.1 (develop version). Ref: pingpong-labs/modules#151
REVERT: 139ee0b update title

git-subtree-dir: src/Pingpong/Shortcode
git-subtree-split: 745f0647a7bdc4aa19b9b96d63f29a6e67647878
  • Loading branch information
Gravitano committed Jun 3, 2015
1 parent c3a532b commit 0412591
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
],
"require": {
"php": ">=5.4.0",
"illuminate/container": "5.0.*",
"illuminate/support": "5.0.*"
"illuminate/container": "5.1.*@dev",
"illuminate/support": "5.1.*@dev"
},
"require-dev": {
"phpunit/phpunit": "~4",
Expand All @@ -28,5 +28,5 @@
"Pingpong\\Shortcode\\": ""
}
},
"minimum-stability": "stable"
"minimum-stability": "dev"
}

0 comments on commit 0412591

Please sign in to comment.