diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-03-08 12:07:43 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-03-08 12:07:43 +0100 |
| commit | 5bf49dabc673dbb0180d16ea81435ecac874e5a3 (patch) | |
| tree | 1c0ec7591a2e18097202a51564746e68c27a6744 /.gitignore | |
| parent | 488d5b871407d5be6e4c38692aa7134a1a0e9899 (diff) | |
| parent | 480dac1af2dd5ed5ba3105577559568237fe5d80 (diff) | |
| download | volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.tar.gz volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.tar.bz2 volse-hubzilla-5bf49dabc673dbb0180d16ea81435ecac874e5a3.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8ded8b44a..b01074eaa 100755 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ *.lock *.kate-swp #Ignore emacs tempfiles -.#* +\#* # patch attempts *.orig *.rej |