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

Feature/feed fix #17

Merged
merged 9 commits into from
Apr 26, 2014
Merged

Feature/feed fix #17

merged 9 commits into from
Apr 26, 2014

Conversation

billmag
Copy link
Member

@billmag billmag commented Apr 26, 2014

No description provided.

tobiblas and others added 9 commits April 2, 2014 14:16
Conflicts:
	android-sdk-ui/src/com/appboy/ui/adapters/AppboyListAdapter.java
	android-sdk-ui/src/com/appboy/ui/widget/BaseCardView.java

Also modifies a fix made on this branch to more generically fix the case where we try to replace an existing news feed with a feed that has less cards, which would have caused a crash before.
billmag added a commit that referenced this pull request Apr 26, 2014
@billmag billmag merged commit fde0d82 into master Apr 26, 2014
@billmag billmag deleted the feature/feedFix branch April 26, 2014 03:45
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