merge
authorgrandjoncl <louise.grandjonc@gmail.com>
Wed, 05 Sep 2012 12:40:22 +0200
changeset 772 164a06b49622
parent 769 a49769a3088d
child 773 25358caa88dc
merge
.hgignore
--- a/.hgignore	Fri Aug 31 15:50:15 2012 +0200
+++ b/.hgignore	Wed Sep 05 12:40:22 2012 +0200
@@ -31,4 +31,5 @@
 syntax: regexp
 ^sbin/sync/config\.py$
 syntax: regexp
-^virtualenv/sync/project-boot\.py$
\ No newline at end of file
+^virtualenv/sync/project-boot\.py$
+relre:^.metadata