diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-12 21:10:57 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-12 21:10:57 (GMT) |
| commit | 502b3321716ff063e1992c35cb28483da48b0dd6 (patch) | |
| tree | fdd14f37d4ea8c1b190c90914b7e2d87293ca1bb /NEWS | |
| parent | 95fa23ddf05d900f95a9c7d669c0fed9d5da1356 (diff) | |
| parent | d800b328ebea44310d6bb475c72f6a9e1557f13c (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
Conflicts:
NEWS
browser.py
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,4 +1,9 @@ +<<<<<<< HEAD:NEWS * #2910 Open popups in the current window (marco) +======= +* Add agent-stylesheet.css and support for blocking flash. (tomeu) +* Add support for agent and user stylesheets. (tomeu) +>>>>>>> d800b328ebea44310d6bb475c72f6a9e1557f13c:NEWS 61 |