Marcel Klehr 9d25dcc1f9 Merge branch 'develop' into feature/connectivity-toolbar ... Conflicts: src/templates/pad.html		2012-07-23 11:26:15 +02:00
..
node	Merge pull request #851 from marcelklehr/fix-settings.json	2012-07-17 10:27:18 -07:00
static	Merge branch 'develop' into feature/connectivity-toolbar	2012-07-23 11:26:15 +02:00
templates	Merge branch 'develop' into feature/connectivity-toolbar	2012-07-23 11:26:15 +02:00
ep.json	Make the server restart on plugin install	2012-07-03 23:31:44 +02:00
package.json	Add latest versions of async, express and connect.	2012-07-05 18:11:18 +02:00