diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-09-01 09:11:36 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-09-01 09:11:36 (GMT) |
commit | 6ae5e4111a76f9cb8f59ae6dfc9123365df39467 (patch) | |
tree | ad8f96e324175591b9122980d87db95535d93637 /NEWS | |
parent | 67ef2bd8e5d9beab0f5dcf0a54567590350ad26c (diff) | |
parent | 632354861696311d758b35e8d7c7888b47a2f7b4 (diff) |
Merge branch 'master' into json
Conflicts:
model.py
webactivity.py
Diffstat (limited to 'NEWS')
-rw-r--r-- | NEWS | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +* use sugar tray which enables scrolling for the links (erikos) +* only try to connect to presence service when offline (erikos) + +44 + +* new design for shared links (erikos) * start the activity with in the browser tab open when in joined a shared session or a handle.uri is given (erikos) |