6 Commits

Author	SHA1	Message	Date
Erik	7500ea83a0	merge development	2016-06-14 19:51:56 -04:00
Erik	6fd3294fba	Revert "swift 2.3" ... This reverts commit bfa163f3c2.	2016-06-14 19:41:18 -04:00
Erik	bfa163f3c2	swift 2.3	2016-06-14 19:37:27 -04:00
Erik	d8826a9db3	allow access from objective-c	2016-06-14 16:19:40 -04:00
Erik	523ced2f9a	merge development	2016-06-09 09:37:26 -04:00
Erik	58a5a17464	Move websocket to subfolder, don't combine websocket files	2016-06-09 09:28:40 -04:00