]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 24 Mar 2012 23:38:54 +0000 (19:38 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 24 Mar 2012 23:38:54 +0000 (19:38 -0400)
commit8a6c407282fe10f676f08f21e28647a5c8794e11
treeb5a5bc5881bf5b35cdb52bb997498ef36a391720
parent803f79e0912c4a526a16fdda4809277d8ad3195d
parent3ae43c24487450a749942ef4c3c19fa2a61461b6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  prevent duplicate friend suggestions
  block filed items from deletion
  add the bang
  network filter is now a permission group
  small fix in css
  add right_aside to diabook-blue
  add connectable services to right_aside
  add PostIt to right_aside, fixes in css

* master: