updates from production
This commit is contained in:
		@@ -38,7 +38,6 @@ class User < ActiveRecord::Base
 | 
			
		||||
  has_many :thinghttps, :dependent => :destroy
 | 
			
		||||
  has_many :tweetcontrols, :dependent => :destroy
 | 
			
		||||
  has_many :reacts, :dependent => :destroy
 | 
			
		||||
  has_many :scheduled_thinghttps, :dependent => :destroy
 | 
			
		||||
  has_many :talkbacks, :dependent => :destroy
 | 
			
		||||
  has_many :timecontrols, :dependent => :destroy
 | 
			
		||||
  has_many :plugins, :dependent => :destroy
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,7 @@
 | 
			
		||||
      <% if current_admin_user.present? %>
 | 
			
		||||
        <div class="apps">
 | 
			
		||||
          <%= link_to timecontrols_path do %>
 | 
			
		||||
            <%= image_tag 'scheduled_thinghttp.png', :size => '104x104' %>
 | 
			
		||||
            <%= image_tag 'timecontrol.png', :size => '104x104' %>
 | 
			
		||||
            <br>
 | 
			
		||||
            <%= t(:timecontrol) %>
 | 
			
		||||
          <% end %>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user