aboutsummaryrefslogtreecommitdiff
path: root/quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oin...
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-08-19 19:52:39 +0200
committerMattias Andrée <maandree@operamail.com>2012-08-19 19:52:39 +0200
commit4774e74ba0af1d1716b832c31e3bf31aed305e4b (patch)
treea2d2b4fb14895486c04262da022d4bdea7acd7d6 /quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly.35
parentf763439803559312cd57835d5fc714a963b1788a (diff)
parent64b726770a07a0e04bcec3cf8ab23af4bcc2332f (diff)
downloadponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.tar.gz
ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.tar.bz2
ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.zip
Merge branch 'master' into develop
Diffstat (limited to 'quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly.35')
-rw-r--r--quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly.351
1 files changed, 0 insertions, 1 deletions
diff --git a/quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly.35 b/quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly.35
deleted file mode 100644
index ae4da82..0000000
--- a/quotes/pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly.35
+++ /dev/null
@@ -1 +0,0 @@
-Oui! Zhat is correct, madame.