test/custom_block_test.rb · 3e7d17014ae29b7471ae721540e6482b61a847a2 · taylor-jaydee / geocoder · GitLab

Snippets Groups Projects

Repositories are limited in size now to 1GB. If your repository exceeds this size, it will be automatically deleted.

If you'd like access to our CI/CD builders, please create an issue here.

12 years ago
5d769cb3
Merge branch 'master' of git://github.com/abravalheri/geocoder into abravalheri-master · 5d769cb3
Alex Reisner authored 12 years ago
```
Conflicts:
	lib/geocoder/configuration.rb
	lib/geocoder/stores/active_record.rb
	test/configuration_test.rb
	test/mongoid_test.rb
```
5d769cb3

History
Merge branch 'master' of git://github.com/abravalheri/geocoder into abravalheri-master
Alex Reisner authored 12 years ago
```
Conflicts:
	lib/geocoder/configuration.rb
	lib/geocoder/stores/active_record.rb
	test/configuration_test.rb
	test/mongoid_test.rb
```