summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2015-11-28 11:04:49 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2015-11-28 11:04:49 +0100
commit7f93c08583094c3311c662ba5cc69e1c04ac1813 (patch)
tree7e38d5f1adad56fe237356f69f02fed798477dd3
parentcdc11ad81e3ff61b9d407760014150623a42a6f6 (diff)
parent9f13a13cc0ca8373d2e4bf39171ae29637ca81ee (diff)
downloadhosts-7f93c08583094c3311c662ba5cc69e1c04ac1813.tar.gz
hosts-7f93c08583094c3311c662ba5cc69e1c04ac1813.tar.zst
hosts-7f93c08583094c3311c662ba5cc69e1c04ac1813.zip
Merge branch 'master' into android
-rw-r--r--HomeHiko (renamed from Hiko)0
-rw-r--r--HomeIdandre (renamed from Idandre)0
-rw-r--r--HomeLancel (renamed from Lancel)0
-rw-r--r--HomeMalige (renamed from Malige)0
-rw-r--r--HomeMaman (renamed from Maman)0
-rw-r--r--HomeNilafe (renamed from Nilafe)0
-rw-r--r--HomeOldKary (renamed from Oldkary)0
7 files changed, 0 insertions, 0 deletions
diff --git a/Hiko b/HomeHiko
index c025428..c025428 100644
--- a/Hiko
+++ b/HomeHiko
diff --git a/Idandre b/HomeIdandre
index b9ef0ab..b9ef0ab 100644
--- a/Idandre
+++ b/HomeIdandre
diff --git a/Lancel b/HomeLancel
index abdb39a..abdb39a 100644
--- a/Lancel
+++ b/HomeLancel
diff --git a/Malige b/HomeMalige
index 3bd3efd..3bd3efd 100644
--- a/Malige
+++ b/HomeMalige
diff --git a/Maman b/HomeMaman
index 5656b97..5656b97 100644
--- a/Maman
+++ b/HomeMaman
diff --git a/Nilafe b/HomeNilafe
index 8cb9927..8cb9927 100644
--- a/Nilafe
+++ b/HomeNilafe
diff --git a/Oldkary b/HomeOldKary
index 525571c..525571c 100644
--- a/Oldkary
+++ b/HomeOldKary