aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure/com.etherpad.openofficeservice
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-06-08 08:22:05 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2010-06-08 08:22:05 +0200
commitd7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (patch)
treeae0b65da6432f4c26c8d5a7319efbda5d172846c /infrastructure/com.etherpad.openofficeservice
parentfa61221dcd89fcd72cba2c97971626f456c86e5d (diff)
downloadetherpad-d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2.tar.gz
etherpad-d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2.tar.xz
etherpad-d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2.zip
reverted folder structure change for better mergeing with upstream
Diffstat (limited to '')
-rw-r--r--trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala (renamed from infrastructure/com.etherpad.openofficeservice/importexport.scala)0
1 files changed, 0 insertions, 0 deletions
diff --git a/infrastructure/com.etherpad.openofficeservice/importexport.scala b/trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala
index f5150ad..f5150ad 100644
--- a/infrastructure/com.etherpad.openofficeservice/importexport.scala
+++ b/trunk/infrastructure/com.etherpad.openofficeservice/importexport.scala