Nils Adermann b187031082 Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus ...

* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php

2014-05-02 18:29:50 +02:00

..

javascript

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

2014-05-02 18:29:50 +02:00

plupload

[ticket/11915] Remove files that are no longer used.

2014-01-17 19:25:11 -08:00