]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29d7f26 af7abce)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 23 Apr 2012 22:25:14 +0000 (18:25 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 23 Apr 2012 22:25:14 +0000 (18:25 -0400)
* remotes/upstream/master:
  DE strings, correction of a typo
  diabok-themes: fixed bug in green-wide and dark-wide
  diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
  diabook-themes: bugfix in admin-section
  allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets
  protect jappixmini/proxy from typo check, more work on email2 connector

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.