4 commits

Author	SHA1	Message	Date
ansuz	5a5b9ad718	Merge branch 'netflux' into beta	2016-04-14 12:37:28 +02:00
ansuz	4af987a2a2	point to correct toolbar.js	2016-04-14 12:36:25 +02:00
ansuz	3ade46adc7	Merge branch 'newtests' into beta	2016-04-14 12:33:12 +02:00
ansuz	c867ab04ab	rename /_socket/ app to /p/	2016-04-13 16:01:45 +02:00