Merge remote-tracking branch 'origin/develop'

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

1 files changed, 0 insertions, 33 deletions

diff --git a/core/app/helpers/download_helper.rb b/core/app/helpers/download_helper.rb
deleted file mode 100644
index ee0fe73..0000000
--- a/core/app/helpers/download_helper.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module DownloadHelper
-
-  def alternative_client_links(os = nil)
-    alternative_clients(os).map do |client|
-      link_to(I18n.t("os."+client), client_download_url(client))
-    end
-  end
-
-  def alternative_clients(os = nil)
-    available_clients - [os]
-  end
-
-  def client_download_url(os = nil)
-    client_download_domain + client_download_path(os)
-  end
-
-  def client_download_path(os)
-    download_paths[os.to_s] || download_paths['other'] || ''
-  end
-
-  def available_clients
-    APP_CONFIG[:available_clients] || []
-  end
-
-  def client_download_domain
-    APP_CONFIG[:client_download_domain] || ''
-  end
-
-  def download_paths
-    APP_CONFIG[:download_paths] || {}
-  end
-
-end