Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Revert PR #3088 as discussed in #3265. #3511

Merged
merged 1 commit into from
Jan 22, 2013
Merged

Revert PR #3088 as discussed in #3265. #3511

merged 1 commit into from
Jan 22, 2013

Conversation

spiffyjr
Copy link
Contributor

- Reverts a9aa0a2
- Reverts df6eb13
- Reverts 1ec40d0
@danizord
Copy link
Contributor

👍

@weierophinney
Copy link
Member

@spiffyjr This appears to break something: https://travis-ci.org/zendframework/zf2/jobs/4298055/#L662 -- missing a RecursiveIteratorIterator import, I think.

weierophinney added a commit that referenced this pull request Jan 22, 2013
- was missing RecursiveIteratorIterator
- Updated copyright year
weierophinney added a commit that referenced this pull request Jan 22, 2013
- Updates the copyright to 2013 on all files touched by revert
weierophinney added a commit that referenced this pull request Jan 22, 2013
@weierophinney weierophinney merged commit 517127b into zendframework:develop Jan 22, 2013
@ghost ghost assigned weierophinney Jan 22, 2013
@weierophinney
Copy link
Member

@spiffyjr I took care of the import on merge, as well as restored the copyright year changes.

@spiffyjr
Copy link
Contributor Author

Thanks @weierophinney

@spiffyjr spiffyjr deleted the pr/revert-308 branch January 22, 2013 18:04
weierophinney added a commit to zendframework/zend-permissions-rbac that referenced this pull request May 15, 2015
- was missing RecursiveIteratorIterator
- Updated copyright year
weierophinney added a commit to zendframework/zend-permissions-rbac that referenced this pull request May 15, 2015
- Updates the copyright to 2013 on all files touched by revert
weierophinney added a commit to zendframework/zend-permissions-rbac that referenced this pull request May 15, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants