]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 68ca297) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 10 Mar 2012 00:02:29 +0000 (19:02 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 10 Mar 2012 00:02:29 +0000 (19:02 -0500)
commit686fe47b8892d3c3cd82b77b77adf3c990a7c160
tree470f2e7c84a5959f7e51c6c68e2a97a99266e136tree | snapshot
parent68ca29719e6eb168ca3efa2d60026da924a0e03bcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add js to hide nav-menus, when clicked outside
  fixes in css
  recover contacts total count which got lost
  bug #324 - tinymce used for mail even if editplain being used.
  bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
  keep tony from talking to himself

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