]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5916bc6 44f4b4b)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 19 Apr 2012 16:32:09 +0000 (12:32 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 19 Apr 2012 16:32:09 +0000 (12:32 -0400)
* remotes/upstream/master:
  Hadn't merged fixed typo from upstream.
  EO translation fixes
  filebrowser: fix style, show 10 recent photos if not in an album
  filebrowser: more style, load min and max scale photos
  tinymce: add inlinepopups plugin
  tinymce: add filebrowser for photos and attached files

* master:


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