Chris Cowan 22bfd9e079 Merge branch 'master' of github.com:elasticsearch/kibana into feature/config-migration ... Conflicts: package.json src/server/routes/proxy.js tasks/test.js		2015-01-28 13:17:40 -07:00
..
server/unit/lib	Closes #2377 - Migrate config from > GA	2015-01-23 11:34:29 -07:00
unit	Merge pull request #2742 from lukasolson/issue-2653	2015-01-27 16:17:56 -07:00
utils	removed the dev server and cleaned up package.json	2015-01-20 11:15:31 -07:00
.jshintrc	modified testing dir jshint rules to use 'white' formatting, and fixed style issues	2014-03-05 14:06:10 -07:00