diff options
author | Nathan Lasseter <nathan@4574.co.uk> | 2014-06-07 10:20:54 +0000 |
---|---|---|
committer | Nathan Lasseter <nathan@4574.co.uk> | 2014-06-07 10:20:54 +0000 |
commit | d9c3e6cce5ae3272f52ceec4cc79afaef24b5925 (patch) | |
tree | f16dc1a64c918da9c8a8b856ce7f1a5c821b924b /.gitignore | |
parent | b05cc0180d8dae5af2cc11860c3654cc0e45ed2b (diff) | |
parent | e5f2281f8523c67cebfa4eaa647043db783a786c (diff) |
Merge conflict
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,3 +1,4 @@ +.htaccess .htpasswd settings.php posts/ |