Merge branch '1.9.1' into devel
Conflicts: install_full/ubuntu/airtime-full-install utils/airtime-update-db-settings.py
This commit is contained in:
commit
b5684bb5b1
20 changed files with 1921 additions and 46 deletions
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python2.6
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue