Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d60fd0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d60fd0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d60fd0a Branch: refs/heads/ignite-843 Commit: 1d60fd0af4f50071889f504aebe46e991df5f259 Parents: 4ed7c4e 2d7a382 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jun 18 13:10:57 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jun 18 13:10:57 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/routes/pages.js | 30 ++++---------------- .../webconfig/nodejs/views/layout-sidebar.jade | 2 +- modules/webconfig/nodejs/views/summary.jade | 26 +++++++++++++++++ 3 files changed, 32 insertions(+), 26 deletions(-) ----------------------------------------------------------------------