Skip to content

Bmichotte conflict#1

Merged
bmichotte merged 9 commits intobmichotte:popoverfrom
GantMan:bmichotte_conflict
Jul 30, 2015
Merged

Bmichotte conflict#1
bmichotte merged 9 commits intobmichotte:popoverfrom
GantMan:bmichotte_conflict

Conversation

@GantMan
Copy link
Copy Markdown

@GantMan GantMan commented Jul 30, 2015

Hey, I merged a bunch of junk and it broke your pull request, so I went ahead and handled the merge conflict for you.

I'm interested in your thoughts on actionsheets crashing on iPads. You're the first one to start raising the iPad usage. I'm pondering, should RedAlert just shift all actionsheets to popovers, rather than asking the user to specify :popover?

Anyhow, I'd love to get more people in this discussion. But first! here's that merge resolution!

bmichotte added a commit that referenced this pull request Jul 30, 2015
@bmichotte bmichotte merged commit c622598 into bmichotte:popover Jul 30, 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.

4 participants