]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c40999 47c3b43)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 6 May 2012 08:51:15 +0000 (04:51 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 6 May 2012 08:51:15 +0000 (04:51 -0400)
* remotes/upstream/master:
  bad sql left after the mailbox in/out merge

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.