Fix #1805 conflict with Redcloth #1807

Merged
merged 2 commits into from Dec 11, 2012

Conversation

Projects
None yet
3 participants
Contributor

adrienkohlbecker commented Dec 7, 2012

No description provided.

Owner

seanlinsley commented Dec 7, 2012

So you know, the tests failed because you didn't capitalize the I in I18n.

@pcreux pcreux added a commit that referenced this pull request Dec 11, 2012

@pcreux pcreux Merge pull request #1807 from adrienkohlbecker/master
Fix #1805 conflict with Redcloth
148160e

@pcreux pcreux merged commit 148160e into activeadmin:master Dec 11, 2012

1 check passed

default The Travis build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment