Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

3 files changed, 0 insertions, 33 deletions

diff --git a/help/config/initializers/account_lifecycle.rb b/help/config/initializers/account_lifecycle.rb
deleted file mode 100644
index d9f04c1..0000000
--- a/help/config/initializers/account_lifecycle.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-ActiveSupport.on_load(:account) do
-  include AccountExtension::Tickets
-end
diff --git a/help/config/locales/en.yml b/help/config/locales/en.yml
deleted file mode 100644
index 342adea..0000000
--- a/help/config/locales/en.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-en:
-  access_ticket_text: >
-    You can later access this ticket at the URL %{full_url}. You might want to bookmark this page to find it again.
-    Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to
-    remove it from the browser history.
-  support_tickets: "Support Tickets"
-  all_tickets: "All Tickets"
-  my_tickets: "My Tickets"
-  open_tickets: "Open Tickets"
-  closed_tickets: "Closed Tickets"
-  new_ticket: "New Ticket"
-  tickets: "Tickets"
-  subject: "Subject"
-  destroy: "Destroy"
-  open: "Open"
-  closed: "Closed"
-  close: "Close"
-  post_reply: "Post Reply"
-  reply_and_close: "Reply and Close"
-  description: "Description"
-  ticket: "Ticket"
-  regarding_account: "Regarding Account"
\ No newline at end of file
diff --git a/help/config/routes.rb b/help/config/routes.rb
deleted file mode 100644
index 23e0c11..0000000
--- a/help/config/routes.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-Rails.application.routes.draw do
-  scope "(:locale)", :locale => MATCH_LOCALE do
-    resources :tickets, :except => :edit
-    resources :users do
-      resources :tickets, :except => :edit
-    end
-  end
-end