Merge branch 'develop' into pushers
Conflicts: synapse/rest/__init__.py
Showing
- .gitignore 3 additions, 8 deletions.gitignore
- MANIFEST.in 12 additions, 2 deletionsMANIFEST.in
- UPGRADE.rst 2 additions, 2 deletionsUPGRADE.rst
- contrib/cmdclient/console.py 0 additions, 0 deletionscontrib/cmdclient/console.py
- contrib/cmdclient/http.py 0 additions, 0 deletionscontrib/cmdclient/http.py
- contrib/experiments/cursesio.py 0 additions, 0 deletionscontrib/experiments/cursesio.py
- contrib/experiments/test_messaging.py 0 additions, 0 deletionscontrib/experiments/test_messaging.py
- contrib/graph/graph.py 0 additions, 0 deletionscontrib/graph/graph.py
- contrib/graph/graph2.py 0 additions, 0 deletionscontrib/graph/graph2.py
- demo/start.sh 2 additions, 1 deletiondemo/start.sh
- jsfiddles/create_room_send_msg/demo.css 0 additions, 17 deletionsjsfiddles/create_room_send_msg/demo.css
- jsfiddles/create_room_send_msg/demo.html 0 additions, 30 deletionsjsfiddles/create_room_send_msg/demo.html
- jsfiddles/create_room_send_msg/demo.js 0 additions, 113 deletionsjsfiddles/create_room_send_msg/demo.js
- jsfiddles/event_stream/demo.css 0 additions, 17 deletionsjsfiddles/event_stream/demo.css
- jsfiddles/event_stream/demo.html 0 additions, 23 deletionsjsfiddles/event_stream/demo.html
- jsfiddles/event_stream/demo.js 0 additions, 145 deletionsjsfiddles/event_stream/demo.js
- jsfiddles/example_app/demo.css 0 additions, 43 deletionsjsfiddles/example_app/demo.css
- jsfiddles/example_app/demo.details 0 additions, 7 deletionsjsfiddles/example_app/demo.details
- jsfiddles/example_app/demo.html 0 additions, 56 deletionsjsfiddles/example_app/demo.html
- jsfiddles/example_app/demo.js 0 additions, 327 deletionsjsfiddles/example_app/demo.js
Loading
Please register or sign in to comment