diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-06 01:46:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-06 01:46:13 +0000 |
| commit | 10d7c367b0a83dc5abf69c0e343b19696f542dd6 (patch) | |
| tree | 5f177ccf7784335a73eca2987b890c45ab64268c | |
| parent | e5e6c846ead9ea4cacc53c2308c5ca86ce1ab766 (diff) | |
| parent | 5e18a922e430de0d50344ce7f432ef9424e04de8 (diff) | |
| download | gitlab-ce-10d7c367b0a83dc5abf69c0e343b19696f542dd6.tar.gz | |
Merge branch 'master' into 'master'
Remove tmp/.gitkeep
This file is obsolete since 5b4aba5f as it exists
solely for the directory to exist.
See merge request !1506
| -rw-r--r-- | tmp/.gitkeep | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tmp/.gitkeep b/tmp/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 --- a/tmp/.gitkeep +++ /dev/null |