Merge branch 'master' of github.com:domify/registry

Conflicts:
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-04-15 11:33:20 +03:00
commit 629f125ba6
4 changed files with 4 additions and 4 deletions

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150415075408) do
ActiveRecord::Schema.define(version: 20150414151357) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"