Skip to content

Commit

Permalink
Merge branch 'master' of github.com:profmaad/activeadmin-mongoid
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/active_admin/mongoid/resource.rb
  • Loading branch information
profmaad committed Jan 5, 2014
2 parents 0fb5a35 + a227aa9 commit c2547d4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit c2547d4

Please sign in to comment.