aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcinzelent <zelent.marcin@gmail.com>2017-11-30 12:47:42 +0100
committermarcinzelent <zelent.marcin@gmail.com>2017-11-30 12:47:42 +0100
commit1ccf8cd89e5d1d5b77a148009ad0060d8244dc8f (patch)
tree078870e0efad024fa7b7b5f5302f9fc1a0384302 /.gitignore
parent3ece21832e7f2ebe3be8fd25bc919106df9a4106 (diff)
parent44b3568c7c21cceac34020e21000a2d30fa03ae3 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2f75ca1..eaac344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
!var/SymfonyRequirements.php
/vendor/
/web/bundles/
+/.idea/