Skip to content

Develop#266

Merged
Gummibeer merged 35 commits intomasterfrom
develop
Feb 6, 2017
Merged

Develop#266
Gummibeer merged 35 commits intomasterfrom
develop

Conversation

@Gummibeer
Copy link
Collaborator

No description provided.

Gummibeer and others added 30 commits February 6, 2017 11:13
[ci skip] [skip ci]
Apply fixes from StyleCI

[ci skip] [skip ci]
SQLSTATE[23000]: Integrity constraint violation: 1217 Cannot delete or update a parent row: a foreign key constraint fails (SQL: drop table if exists `notification_groups`)
[ci skip] [skip ci]
Apply fixes from StyleCI

[ci skip] [skip ci]
[ci skip] [skip ci]
Apply fixes from StyleCI

[ci skip] [skip ci]
[ci skip] [skip ci]
Apply fixes from StyleCI

[ci skip] [skip ci]
[ci skip] [skip ci]
Apply fixes from StyleCI

[ci skip] [skip ci]
# Conflicts:
#	tests/NotifynderTestCase.php
[ci skip] [skip ci]
Apply fixes from StyleCI

[ci skip] [skip ci]
@Gummibeer Gummibeer merged commit 16e7d72 into master Feb 6, 2017
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.

2 participants