]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 10 Mar 2012 05:15:29 +0000 (00:15 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 10 Mar 2012 05:15:29 +0000 (00:15 -0500)
commit665ad7e6600778c446aa9c5fc48ed32b309e64a7
treedc899a136a2b9666f8f44bfec5e515ea7198ff29
parent686fe47b8892d3c3cd82b77b77adf3c990a7c160
parentd50a839c0420634ec5756c9f2f95c26484b63b4d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  spec directory
  allow user to set number of items to show on network page
  revup

* master: