This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c2812b4675bacdbed63b17fff138d0c5605de0c3
Merge: 90cd8aa 3c431bb
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Thu Jun 20 14:34:38 2019 +0530
Merge remote-tracking branch 'origin/4.12'
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --cc .gitignore
index 9ce1ff0,0e50a95..66ce1c2
--- a/.gitignore
+++ b/.gitignore
@@@ -101,4 -99,4 +101,5 @@@ scripts/.pydevprojec
*.qcow2
*.raw
venv
+node_modules
+ .vscode
