diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-04-08 20:50:07 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-04-08 20:50:07 -0600 |
| commit | 449596dbef219d5b75fa47ca1934d1d58ec5e45b (patch) | |
| tree | 564f2bf054629755f806a709eb231e11eec2d25a /.gitignore | |
| parent | b777d610713060511195aa099519677ad29ded0e (diff) | |
| parent | 2a0cc019ed0b5b5d433be3ed92711d8fcc17db14 (diff) | |
| download | askbot-449596dbef219d5b75fa47ca1934d1d58ec5e45b.tar.gz askbot-449596dbef219d5b75fa47ca1934d1d58ec5e45b.tar.bz2 askbot-449596dbef219d5b75fa47ca1934d1d58ec5e45b.zip | |
Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into byronmerge
Conflicts:
askbot/skins/default/media/style/style.less
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -47,3 +47,4 @@ run recaptcha /.ve /db.sq3 +*.DS_Store |