]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dddf330) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 15 Apr 2012 04:40:21 +0000 (00:40 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 15 Apr 2012 04:40:21 +0000 (00:40 -0400)
commitadc932a5e2fc85fc659fe738e4f1316e039e9f00
treeb45087fc3bd2c69c7fd872106365d70aa4d0ce84tree | snapshot
parentdddf3307af24de71a8b6e52a984ba2f2e310c3b7commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: added js for auto-growing comment-textareas
  diabook: theme-settings: add a wide-option
  Another bunch of executable permission removal
  Removed execution permission: lintian warning in Debian packaging

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