diff options
author | Peter Grassberger <petertheone@gmail.com> | 2016-04-01 15:30:45 (GMT) |
---|---|---|
committer | Peter Grassberger <petertheone@gmail.com> | 2016-04-01 15:30:45 (GMT) |
commit | 8db94592d6222fbd0153cf05c83724d7ac518634 (patch) | |
tree | fe89e9ed21ce849f3f5fcbfecff335d1cc90f409 /README | |
parent | 3c584d7ee53ecfb35f32a2182971dfbc30009590 (diff) | |
parent | 4a79af6bf48f7543a407d86fc73ce70f39fc6d94 (diff) |
Merge branch 'master' into rdxportjs-refactor
Conflicts:
www/js/importer.js
www/js/jingles.js
www/js/musicpools.js
www/js/shows.js
Diffstat (limited to 'README')
-rw-r--r-- | README | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ LICENSE Installation ============ -# sudo aptitude install apache2 libapache2-mpm-itk libapache2-mod-perl2 libconfig-inifiles-perl libdbd-mysql-perl libjson-pp-perl libxml-quote-perl librhrd-perl libjs-jquery libjs-bootstrap rivendell-server +# sudo aptitude install apache2 libapache2-mpm-itk libapache2-mod-perl2 libjson-any-perl libxml-quote-perl librhrd-perl libjs-jquery libjs-bootstrap rivendell-server # sudo a2enmod ssl authnz_ldap perl proxy_wstunnel # sudo /etc/init.d/apache2 restart |