| commit | f97c5dad82084664d0b2a04e79f8b79ca36346a7 | [log] [tgz] |
|---|---|---|
| author | Sagar Vora <sagar@resilient.tech> | Tue Jan 29 18:39:14 2019 +0530 |
| committer | Sagar Vora <sagar@resilient.tech> | Tue Jan 29 18:39:14 2019 +0530 |
| tree | 7c416497494f09a7c28cd25dd7d17a26170284ed | |
| parent | f1ff5c24ff340550cfc9ea5637643745649b3ccc [diff] [blame] | |
| parent | 3f1fb9ca7e528fe94d8929ca72991ac16e383a54 [diff] [blame] |
Merge branch 'staging' into develop
diff --git a/.gitignore b/.gitignore index 824f6b8..630effc 100644 --- a/.gitignore +++ b/.gitignore
@@ -13,4 +13,4 @@ __pycache__ *~ .idea/ -node_modules \ No newline at end of file +node_modules/