commit 5aba8cf00e01c93d35733e13dfc5fe9f7f59cf7e
author ovander <onno.van.der.straaten@gmail.com> Mon Sep 23 17:46:03 2013 +0200
committer ovander <onno.van.der.straaten@gmail.com> Mon Sep 23 18:46:28 2013 +0200
tree 1afed488c5bf68bf54d87ac923ed0bbee56ef50c
parent 58adbb092feed495b5a3822ec2b93a5bb423bef8
parent f37ed80c30d937eb790ecbcf0b0458418377a30c

Run in a folder. Again. Git is like that, you might overwrite your own
changes.
EPF-31

source/app/models/version.rb

diff --git a/source/app/models/version.rb b/source/app/models/version.rb
index 9e40b81..4623f16 100644
--- a/source/app/models/version.rb
+++ b/source/app/models/version.rb
@@ -145,7 +145,7 @@
   end
   
   def url_to_diff(from_version)
-    ENV['EPFWIKI_BASE_URL'] + self.relpath_to_diff(from_version).sub('/','')
+    ENV['EPFWIKI_BASE_URL'] + self.relpath_to_diff(from_version)
   end
   
   # Path intermediate (tidied, cleaned) HTML files, prepared for XHTMLDiff

source/public/pages/view/.htaccess

diff --git a/source/public/pages/view/.htaccess b/source/public/pages/view/.htaccess
deleted file mode 100644
index 91091a7..0000000
--- a/source/public/pages/view/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-ForceType text/javascript;charset=utf-8
\ No newline at end of file

source/tmp/pids/server.pid

diff --git a/source/tmp/pids/server.pid b/source/tmp/pids/server.pid
index 12659e6..fa2e567 100644
--- a/source/tmp/pids/server.pid
+++ b/source/tmp/pids/server.pid
@@ -1 +1 @@
-22283
\ No newline at end of file
+18986
\ No newline at end of file