From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 18 Oct 2013 17:39:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ea4c18569ab7d0ab9f5a5ca94a9f8a9ce4c9b28d;hp=d329a266f18d8d86219ad6865b9acc84b357e913

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

diff --git a/myslice/myslice.ini b/myslice/myslice.ini
new file mode 100644
index 00000000..c22836e9
--- /dev/null
+++ b/myslice/myslice.ini
@@ -0,0 +1,4 @@
+[manifold]
+url = http://localhost:7080
+admin_user = admin
+admin_password = admin