Merge with remote

This commit is contained in:
Eric Charles 2016-02-25 13:31:37 +01:00
commit a119b721d4

2
.gitignore vendored
View file

@ -56,6 +56,8 @@ zeppelin-web/bower_components
**/lib/rscala
**/lib/rscala
# OS generated files #
######################
.DS_Store