diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-23 03:19:57 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-23 03:19:57 +0200 |
commit | 38324c570b954f075865ea59abaf2c6caf0c1de0 (patch) | |
tree | 92b4e78b27465a839da63544802c99ec1ff06faa /extraponies/info | |
parent | 8c0cb19323d385b6a2bdbc654b096038893e9b05 (diff) | |
parent | 1906e0f573b7476636735fa6d60d865c01f1acf8 (diff) | |
download | ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.tar.gz ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.tar.bz2 ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.zip |
info change log update + merge conflict
Diffstat (limited to 'extraponies/info')
-rw-r--r-- | extraponies/info | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/extraponies/info b/extraponies/info deleted file mode 100644 index 12d5bea..0000000 --- a/extraponies/info +++ /dev/null @@ -1,3 +0,0 @@ -Dummy file for this directory as it is otherwise empty. - -Non-MLP:FiM ponies should be placed here. |