]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 1 May 2012 08:02:17 +0000 (04:02 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 1 May 2012 08:02:17 +0000 (04:02 -0400)
commit5d6296b81b43655d41320f99dde5ef6c9f1382f8
tree2ca4af49655a3cf4f1a2d2cf4ea7b5936b8d9a17
parentf175af05f92384fab7adb75390a8aa52dc1bd7e1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  hidden plugins (add .hidden file to dir)

* master: