diff options
| author |  Alexis Degrugillier <github@ainw.org>
| 2014-01-03 00:03:28 -0500 |
|---|---|---|
| committer | Alexis Degrugillier <github@ainw.org>
| 2014-01-03 00:03:28 -0500 |
| commit | f0c2bb74ebbae1bd336d79a22c5ccf4080620bb4 (patch) | |
| tree | afc52950d50d5d4567437e42240b3998b51c4f6e /data | |
| parent | 7db271e95ebab52c31c78f51270de71af1d750d2 (diff) | |
| parent | 1d3ff88ae6cbb072f0d2a76308a42f2baf6cb84d (diff) | |
Merge branch 'dev' into shortcuts
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/.gitignore b/data/.gitignore index 005982b00..afb16d9aa 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -5,3 +5,4 @@ config.php touch.txt no-cache.txt *.bak.php +*.lock.txt |