]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5bc0cfa) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 24 May 2012 23:30:41 +0000 (19:30 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 24 May 2012 23:30:41 +0000 (19:30 -0400)
commit25547cb21fff3f702a81abbeb5332094c020109e
treeccc8ea49461ffdba3870857ea13925370cdbe320tree | snapshot
parent5bc0cfa06724204f8de26508859b1b76636f77bdcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix small js error when user not logged in
  install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect

* master:
Unnamed repository; edit this file 'description' to name the repository.