Merge branch 'master' into 110395650-domain_crons

# Conflicts:
#	app/models/domain.rb
This commit is contained in:
Vladimir Krylov 2016-02-01 12:02:44 +02:00
commit 2028ffe5a5
36 changed files with 285 additions and 99 deletions

View file

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe Directo, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end