From b4fc2f892b877fe0cfb90063248d720bf87b49c8 Mon Sep 17 00:00:00 2001
From: Austin Gillmann <alucard@cuntflaps.me>
Date: Tue, 3 Jan 2017 19:12:58 -0600
Subject: Merge php submodule into pomf, delete expiry.

---
 static/php/.mailmap | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 static/php/.mailmap

(limited to 'static/php/.mailmap')

diff --git a/static/php/.mailmap b/static/php/.mailmap
new file mode 100644
index 0000000..5605d2c
--- /dev/null
+++ b/static/php/.mailmap
@@ -0,0 +1,6 @@
+Eric Johansson <neku@pomf.se>
+Eric Johansson <neku@pomf.se> nokonoko <petanull@gmail.com>
+Eliot Whalan <ewhal@pantsu.cat> <contact@pantsu.cat>
+Juuso Lapinlampi <wub@partyvan.eu>
+alchimist <alchimist@nwa.xyz> cenci0 <alchimist94@gmail.com>
+Austin Gillmann <alucard@cuntflaps.me>
-- 
cgit v1.2.3