]> git.mxchange.org Git - friendica.git/commit
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)
commita3137eec11ddd4c5d3e2b4f2c45fcfb356d2c2b0
tree418391375830247eac3da1eadb5a6993a76b7977
parent2687f4377c301205afbbcf2034cbb1b9556e08e7
parente39014a3a765f7afb189be5409b60a771f5c46da
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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: