diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
| commit | aa2a7dad59c0db8b15aadbb58a861237a36c95ee (patch) | |
| tree | d55ab82ba5c5195b003f9b29c2c17646fffbdae6 /vendor/gitignore/Lithium.gitignore | |
| parent | b99471ca5de6e867c44ea21bf85252cd174ccec7 (diff) | |
| parent | c002a560afae7db6a5c778bc78028243c2fc945a (diff) | |
| download | gitlab-ce-aa2a7dad59c0db8b15aadbb58a861237a36c95ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
# app/assets/stylesheets/pages/issuable.scss
Diffstat (limited to 'vendor/gitignore/Lithium.gitignore')
| -rw-r--r-- | vendor/gitignore/Lithium.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vendor/gitignore/Lithium.gitignore b/vendor/gitignore/Lithium.gitignore new file mode 100644 index 00000000000..7b22568ea89 --- /dev/null +++ b/vendor/gitignore/Lithium.gitignore @@ -0,0 +1,2 @@ +libraries/* +resources/tmp/* |