diff options
author | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
---|---|---|
committer | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
commit | 7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f (patch) | |
tree | e998d4fca34cebe801c982d1d7bf8932adbf218a /.gitignore | |
parent | 891e36f57e2e3955a4f13019e8fdc58fce826434 (diff) | |
parent | fac096405338e0f46fa248320318436d862678fc (diff) |
Merge remote-tracking branch 'origin' into hookhead
Conflicts:
classes/feeds.php
fix for merging up to the origin
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ac3c24319..b4853806c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *~ *.DS_Store #* -lib/floIcon.php .idea/* config.php feed-icons/* |