zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-22 02:35:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry into country-refactor

Browse source 
Conflicts:
	app/models/address.rb
	app/models/country_deprecated.rb
	app/models/registrar.rb
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-02-02 11:42:21 +02:00
commit 7537bb3712
91 changed files with 1614 additions and 698 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -1,4 +1,5 @@
class User < ActiveRecord::Base
include Versions # version/user_version.rb
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable and :omniauthable
devise :trackable, :timeoutable