diff options
| author | friendica <info@friendica.com> | 2013-09-19 01:10:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-19 01:10:10 -0700 |
| commit | c0e8b0cd9d38fb5df722f7925147b18c8cbd3d8f (patch) | |
| tree | b18c52c42d1d404115e1b4f5e2ad39932c6e4e3f /.gitignore | |
| parent | 63fc92b9e5d75f0dda0aecaaa0e1feb56d2b9744 (diff) | |
| parent | 5607737c395c32a0c9f0ee071c571f6a7509f8eb (diff) | |
| download | volse-hubzilla-c0e8b0cd9d38fb5df722f7925147b18c8cbd3d8f.tar.gz volse-hubzilla-c0e8b0cd9d38fb5df722f7925147b18c8cbd3d8f.tar.bz2 volse-hubzilla-c0e8b0cd9d38fb5df722f7925147b18c8cbd3d8f.zip | |
Merge branch 'zpull'
Conflicts:
boot.php
install/database.sql
install/update.php
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions