]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 10:25:05 +0000 (05:25 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 10:25:05 +0000 (05:25 -0500)
commit718c5ea23e642f8eb3fd91670e5b8faf705df55b
tree8d6792d5e06efae2b26ae0a70696cd6278d57a6c
parentcf7e141055fe0028a56bfca64d8e0646c5470863
parent53412dacd4cb52f0c1162af7ba66aa01f71147b3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update globaldir when page-type changes, add spam date field
  clicking contact on contacts page broken link

* master: