]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94d4cad 1fae778)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:26:22 +0000 (18:26 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:26:22 +0000 (18:26 -0500)
commita33ca0a7318cf727b5c605c381e4c6f20463ad3e
treed9e51a0d8667cad5fcf3fc22cde9b7080ecb12a7tree | snapshot
parent94d4cad701ab6b618afb288c88165c0ec17ae238commit | diff
parent1fae778421253b713c166f3e4d329997a9e214a3commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  search should be ok, but a little extra security won't hurt
  messages-menu translation, add scroll-to-top and theme-bug-report in theme
  Fixed...merged with mainline THEN added beards.
  added beard smileys
  doc/Account-Basics.md
  doc/Account-Basics.md
  a
  doc/Remove-Account.md
  doc/Making-Friends.md
  doc/Bugs-and-Issues.md
  doc/Account-Basics.md

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