Diff

squishy @ 122:1dfd28db10bd

Merge with MattJ
author Kim Alvefur <zash@zash.se>
date Mon, 08 Sep 2014 12:20:24 +0200
parent 120:f1166645a56c
parent 107:67ff8f55db4a
child 139:6909e479c56b
line wrap: on
line diff
--- a/squishy	Sun Aug 24 20:34:04 2014 +0100
+++ b/squishy	Mon Sep 08 12:20:24 2014 +0200
@@ -3,6 +3,7 @@
 	"sendfilecontent";
 	"receive";
 	"version";
+	"ping";
 	"bounce";
 	"mirror";
 	"raw";