aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-04-05 13:12:42 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-04-05 13:12:42 +0200
commit6ba3257b18c191358f24ccfa8aff93f804916eb2 (patch)
tree8853be22cbe79f85801e83feda00f8f0f573e36e
parent77cf3e907288c34a72b053f758a821d4a707a5d7 (diff)
parent8ea9cdd703179cddaebfb35ab4584565b93d3507 (diff)
Merge remote-tracking branch 'origin/IDN' into dev
-rw-r--r--data/subscriptions/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/data/subscriptions/.gitignore b/data/subscriptions/.gitignore
deleted file mode 100644
index 150f68c80..000000000
--- a/data/subscriptions/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*/*