Remove .idea folder

diff --git a/.gitignore b/.gitignore
index ffba4045346537cba343d151a9b1a93e0ae45611..7800efeb37b84d603313edf9e8d541fc8e2ab505 100644 (file)
--- 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 (file)
index 94a25f7..0000000
--- 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 c0cc7f43b1e1652e1c5d4f18c510c4d21a056c02..e7fd56599e9e22eddf92c1063419fec6ab82e15e 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit c0cc7f43b1e1652e1c5d4f18c510c4d21a056c02
+Subproject commit e7fd56599e9e22eddf92c1063419fec6ab82e15e