Me clip can get rather big without limiting the amount of text shown.
Increase clip h1 line-height
Merge remote-tracking branch 'origin/newframework' into meClip
meClip arrow alignment.
Merge origin/newframework and fix conflicts
Merge origin/newframework and fix conflicts
Merge remote-tracking branch 'bp323/meClip' into meClip
Reversing the discussion thread order in activities
Hidding the Etherpad iFrame when unloading the page
Use $rootel in etherpad.js
Fixed Chrome sorting issue
Merge pull request #2933 from nicolaasmatthijs/activity-discussion-sequence

Reversing the discussion thread order in activities
Merge origin/master and fix conflicts
move nginx files into a dir and split out mime config
consolidate gitignores
Use threadKey to page through comments, not creation date
Merge pull request #2941 from stuartf/nginx

Split mime types out of nginx.conf
Merge pull request #2911 from mrvisser/issue-2911

Infinite scroll keeps loading next page even though there isn't any.
Added oae-threedots to the discussion page.
Merge branch 'meClip'

* meClip:
  Added oae-threedots to the discussion page.
  meClip arrow alignment.
  Increase clip h1 line-height
  Me clip can get rather big without limiting the amount of text shown.