Tomasz Drwięga 2ef6f756d0 Merge branch 'master' into idmanager ... Conflicts: webapp/src/apps.rs webapp/src/page/mod.rs webapp/src/proxypac.rs webapp/src/router/mod.rs		2016-05-16 20:22:19 +02:00
..
src	Merge branch 'master' into idmanager	2016-05-16 20:22:19 +02:00
Cargo.toml	Bumping status&idmanager	2016-05-16 20:10:43 +02:00