]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2687f43 e39014a)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 16 May 2012 03:40:35 +0000 (23:40 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 16 May 2012 03:40:35 +0000 (23:40 -0400)
* remotes/upstream/master:
  update tinymce to 3.5.0.1
  rev update
  DE strings
  slackr drop shadows extended
  Allow plugins to modify the contact photo menu
  rev update

* master:


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