diff options
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 |