Mattias Andrée 7e3aa7ee91 resolve merge conflict ... Signed-off-by: Mattias Andrée <maandree@operamail.com>		2013-06-01 14:54:49 +02:00
..
ponysay	sync manual	2013-04-05 09:58:33 +02:00
fortune+ponysay.html	Fix grammatical/typographical/spelling mistakes and rephrase a few statements.	2013-06-01 13:44:31 +03:00
index.html	Fix the page layout I accidentally broke.	2013-06-01 13:59:17 +03:00