Skip to content
Snippets Groups Projects
Commit f723a647 authored by Alex Reisner's avatar Alex Reisner
Browse files

Merge branch 'cm-add-skip-flag' of git://github.com/cmavromoustakos/geocoder... 

Merge branch 'cm-add-skip-flag' of git://github.com/cmavromoustakos/geocoder into cmavromoustakos-cm-add-skip-flag

Conflicts:
	lib/geocoder/models/mongo_base.rb
	test/mongoid_test.rb
parents e860b4da ba149bd4
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment