Merge branch 'master' into norway

Conflicts:
	assets/stylesheets/custom.css.scss
	lib/views/general/_orglink.html.erb

1 files changed, 0 insertions, 16 deletions

diff --git a/install.rb b/install.rb
index 4aee9f7..f7732d3 100644
--- a/install.rb
+++ b/install.rb
@@ -1,17 +1 @@
 # Install hook code here
-
-plugin_path = File.expand_path(File.join(File.dirname(__FILE__), "public"))
-main_app_path = Rails.root.join('public', 'alavetelitheme')
-
-# If the symlink to be created exists, warn the user and do nothing
-if File.exists?(main_app_path)
-	puts "WARNING: #{main_app_path} already exists, the symbolic link won't be created"
-else # Create symlink
-	begin
-		print "Creating symbolic link from #{main_app_path} to #{plugin_path}... "
-		File.symlink(plugin_path, main_app_path)
-		puts "done"
-	rescue NotImplementedError
-		puts "failed: symbolic links not supported"	
-	end
-end