]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 10 Apr 2012 09:03:32 +0000 (05:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 10 Apr 2012 09:03:32 +0000 (05:03 -0400)
commit514780745f4e2a66fd610d835b16c9b065c52355
treed932b7f36969d34f398972b527528e035d38c30f
parent61c28e8c2ee5c80c162e0ea7b8fec10e26790641
parent4c3b835307c072cbdf3b68857c34fc22a58872c6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  path to default.php in theme dir was incorrect

* master: