]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 310ad91 ce29f55)
Merge pull request #1008 from annando/master
authorfabrixxm <fabrix.xm@gmail.com>
Sat, 14 Jun 2014 18:05:10 +0000 (20:05 +0200)
committerfabrixxm <fabrix.xm@gmail.com>
Sat, 14 Jun 2014 18:05:10 +0000 (20:05 +0200)
Expire, "attachment" element and database structure

1  2 
boot.php patch | diff1 | diff2 | blob | history

diff --cc boot.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.