Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated composer.lock #1537

Merged
merged 1 commit into from
Dec 24, 2015
Merged

Updated composer.lock #1537

merged 1 commit into from
Dec 24, 2015

Conversation

bdunogier
Copy link
Contributor

Updates composer.lock.

Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference.
See scheb/two-factor-bundle#33.

@j0k3r
Copy link
Member

j0k3r commented Dec 23, 2015

Oh yes, Rulerz now requires PHP 5.5, could you update Travis & composer.json with that information?

@bdunogier
Copy link
Contributor Author

Oh yes, Rulerz now requires PHP 5.5, could you update Travis & composer.json with that information?

Sure (rebased).

@j0k3r
Copy link
Member

j0k3r commented Dec 23, 2015

You forgot to remove PHP 5.4 from .travis.yml file :)

Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference.
See scheb/two-factor-bundle#33.

Also updated php version requirement to 5.5.0.
j0k3r added a commit that referenced this pull request Dec 24, 2015
@j0k3r j0k3r merged commit 22c1d29 into wallabag:v2 Dec 24, 2015
@j0k3r
Copy link
Member

j0k3r commented Dec 24, 2015

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants