projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7684f63 5d2c590)
Merge branch 'pull'
authorfriendica <info@friendica.com>
Thu, 15 Mar 2012 23:39:21 +0000 (16:39 -0700)
committerfriendica <info@friendica.com>
Thu, 15 Mar 2012 23:39:21 +0000 (16:39 -0700)
1  2 
database.sql patch | diff1 | diff2 | blob | history

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