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.

Sign up for GitHub

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

Jump to bottom

Cache fallback #389

Merged
merged 5 commits into from
Mar 24, 2016
Merged

Cache fallback #389

merged 5 commits into from
Mar 24, 2016

Conversation

mcneely
Copy link
Contributor

@mcneely mcneely commented Jan 26, 2015

No description provided.

@mcneely mcneely closed this Jan 26, 2015
@mcneely mcneely deleted the CACHE_FALLBACK branch January 26, 2015 17:16
@mcneely mcneely restored the CACHE_FALLBACK branch January 26, 2015 17:16
@mcneely mcneely reopened this Jan 29, 2015
@mblaney
Copy link
Member

mblaney commented Mar 15, 2016

sorry do you mind updating this PR?

Merge branch 'master' into CACHE_FALLBACK
a426c54 
Conflicts:
	library/SimplePie.php
@mcneely
Copy link
Contributor Author

mcneely commented Mar 23, 2016

Done.

@mblaney mblaney merged commit 4f4ee82 into simplepie:master Mar 24, 2016
@mcneely mcneely deleted the CACHE_FALLBACK branch March 15, 2018 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mcneely @mblaney @rmccue