Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts: debian/control
This commit is contained in:
commit
e68e6d9160
|
@ -41,7 +41,7 @@ Depends: apache2,
|
|||
pwgen,
|
||||
python,
|
||||
rabbitmq-server,
|
||||
silan (>= 0.3.0~),
|
||||
silan (>= 0.3.1~),
|
||||
sudo,
|
||||
sysv-rc,
|
||||
tar (>= 1.22),
|
||||
|
|
Loading…
Reference in New Issue