]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 13 Mar 2012 18:41:46 +0000 (14:41 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 13 Mar 2012 18:41:46 +0000 (14:41 -0400)
commit1763a6c9c2a80642291e13f80be8a092465924ae
treeed6ecc655add4d0fa2bd2bf233fa648d4d875090
parent203fa94e1794d076894f8985bd60622784aa9156
parent5a4167646553e589cf9647c0e0d0446e3f5fd672
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term,  and theming.

* master: