David Baker 92b3dc3219 Merge branch 'develop' into pushrules2		2015-03-04 14:56:41 +00:00
..
appservice	Convert expected format for AS regex to include exclusivity.	2015-02-27 10:44:32 +00:00
client	s/user_name/user/ as per mjark's comment	2015-03-02 18:17:19 +00:00
media	…
__init__.py	…