[Merge] Merged with latest master

Original commit: elastic/x-pack-elasticsearch@b622a9e74b
This commit is contained in:
Khalah Jones-Golden 2015-06-23 18:02:42 -04:00
commit b6531876fb
1 changed files with 4 additions and 0 deletions

4
.bowerrc Normal file
View File

@ -0,0 +1,4 @@
{
"directory": "./public/bower_components"
}