Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

77da187a

Commit 77da187a authored 12 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into celt_remove

parents 195430dd cc34ed39

No related branches found

No related tags found

No related merge requests found

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

tools/asterisk/extensions.conf 838 additions, 0 deletions

tools/asterisk/extensions.conf
tools/asterisk/sip.conf 1360 additions, 0 deletions

tools/asterisk/sip.conf
tools/pysflphone/sflphonectrl.py 176 additions, 119 deletions

tools/pysflphone/sflphonectrl.py
tools/pysflphone/sippwrap.py 157 additions, 0 deletions

tools/pysflphone/sippwrap.py
tools/pysflphone/test_sflphone_dbus_interface.py 149 additions, 17 deletions

tools/pysflphone/test_sflphone_dbus_interface.py

with 2680 additions and 136 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment