aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAlexander Kiryukhin <alexander@kiryukhin.su>2018-09-06 20:41:13 +0300
committerGitHub <noreply@github.com>2018-09-06 20:41:13 +0300
commit7b657db13f0b76432ca0039e45f4b8f5e09879c2 (patch)
tree954c50f2644212742442e0027efb081620d2a109 /.gitignore
parenta969571772a9761f67672b229741f209f5391560 (diff)
parentaa1a092a9e231e8f923ab40365dff092c2908903 (diff)
Merge branch 'master' into dev
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9f33dd5..83436db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
vendor/
-.idea/ \ No newline at end of file
+.idea/
+composer.lock \ No newline at end of file