Torkel Ödegaard 1acbd5b7d8 :merge branch 'app-pages' ...

Conflicts:
	examples/nginx-app/module.js
	examples/nginx-app/partials/stream.html
	examples/nginx-app/plugin.json

2016-02-09 14:22:08 +01:00

..

nginx-app

:merge branch 'app-pages'

2016-02-09 14:22:08 +01:00

panel-boilerplate-es5

feat(plugins): working on plugin examples

2016-02-09 12:20:09 +01:00