bower file
Merge branch 'release/bower-file'