Adi Sieker b5de5d9fc9 Merge branch 'master' into adi ...

Conflicts:
	AUTHORS
	convore/api.py
	convore/models.py

2011-05-17 23:33:55 +02:00

..

packages

Vendorized anyjson

2011-02-21 14:15:56 -05:00

__init__.py

Vendorized anyjson

2011-02-21 14:15:56 -05:00

api.py

Merge branch 'master' into adi

2011-05-17 23:33:55 +02:00

core.py

split live api, LiveTopic model, sync fixes

2011-04-16 22:03:34 +02:00

groups.py

Search is now a method.

2011-02-22 01:02:16 -05:00

models.py

fixed adding messages from live api

2011-04-20 20:56:03 +02:00

types.py

added implicit sync on accessing a SyncedList.

2011-04-10 23:54:23 +02:00