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

This commit is contained in:
Andres Keskküla 2014-09-25 16:45:12 +03:00
commit e7fb6208ce
12 changed files with 77 additions and 8 deletions

View file

@ -1,4 +1,4 @@
class Admin::ContactsController < ApplicationController
class Admin::ContactsController < AdminController
# TODO created_by and updated_by ids
before_action :set_contact, only: [:show, :destroy, :edit, :update]