]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 23 Mar 2012 14:40:40 +0000 (10:40 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 23 Mar 2012 14:40:40 +0000 (10:40 -0400)
* remotes/upstream/master:
  updated page plugin
  "page" addon - higher performance version of "pages" addon
  update pkg

* master:


Trivial merge