Skip to content

Commit 9c497e1

Browse files
marcusgmarcusg
committed
Merge branch 'master' of git://github.com/stefanoverna/activeadmin-globalize3
Conflicts: config/locales/it.yml
2 parents 1409640 + 0862d38 commit 9c497e1

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)