From: mathieu <mathieu.boye28@gmail.com>
Date: Wed, 18 May 2016 08:50:30 +0000 (+0200)
Subject: Remove .idea folder
X-Git-Tag: 1.6.2^2~15^2~1^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e99096e8eb4202a7f53d7f3e787d0dd87d2f06a1;p=telemeta.git

Remove .idea folder
---

diff --git a/.gitignore b/.gitignore
index ffba4045..7800efeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,5 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 
-.idea/*
+.idea/
 data/backup
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/telemeta/locale b/telemeta/locale
index c0cc7f43..e7fd5659 160000
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit c0cc7f43b1e1652e1c5d4f18c510c4d21a056c02
+Subproject commit e7fd56599e9e22eddf92c1063419fec6ab82e15e