diff options
| author | root | 2016-09-03 19:57:18 +0200 |
|---|---|---|
| committer | root | 2016-09-03 19:57:18 +0200 |
| commit | 7dd0823e93f9ddc25ccc59eff7ce6f5419962757 (patch) | |
| tree | a0186b14a0ea29ec858c6656f2e4577273237a07 | |
| parent | 6898e2cda3e4a46669229302ac9ecb1bcaa9e01f (diff) | |
uncomitted changes on server
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/mrmcd16/config.php | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/mrmcd16/main.less | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/mrmcd16/ws_mrmcd16.svg | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/mrmcd16/ws_mrmcd16_logo.svg | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/qtcon16/QtCon_logo.png | bin | 43630 -> 43630 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/qtcon16/config.php | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | configs/conferences/qtcon16/main.less | 0 |
7 files changed, 2 insertions, 3 deletions
diff --git a/configs/conferences/mrmcd16/config.php b/configs/conferences/mrmcd16/config.php index 76116c5..845114b 100644..100755 --- a/configs/conferences/mrmcd16/config.php +++ b/configs/conferences/mrmcd16/config.php @@ -82,7 +82,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Link zu den Recordings * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - 'RELEASES' => 'https://media.ccc.de/c/mrmcd2016', + 'RELEASES' => 'https://media.ccc.de/c/mrmcd16', /** * Link zu einer (externen) ReLive-Übersichts-Seite @@ -577,7 +577,7 @@ $GLOBALS['CONFIG']['SCHEDULE'] = array( * * Wird diese Zeile auskommentiert, werden alle Räume angezeigt */ - 'ROOMFILTER' => array('saal104', 'saal111'), + //'ROOMFILTER' => array('saal104', 'saal111'), /** * Skalierung der Programm-Vorschau in Sekunden pro Pixel diff --git a/configs/conferences/mrmcd16/main.less b/configs/conferences/mrmcd16/main.less index a0c98b7..a0c98b7 100644..100755 --- a/configs/conferences/mrmcd16/main.less +++ b/configs/conferences/mrmcd16/main.less diff --git a/configs/conferences/mrmcd16/ws_mrmcd16.svg b/configs/conferences/mrmcd16/ws_mrmcd16.svg index 976d778..976d778 100644..100755 --- a/configs/conferences/mrmcd16/ws_mrmcd16.svg +++ b/configs/conferences/mrmcd16/ws_mrmcd16.svg diff --git a/configs/conferences/mrmcd16/ws_mrmcd16_logo.svg b/configs/conferences/mrmcd16/ws_mrmcd16_logo.svg index 453b0f5..453b0f5 100644..100755 --- a/configs/conferences/mrmcd16/ws_mrmcd16_logo.svg +++ b/configs/conferences/mrmcd16/ws_mrmcd16_logo.svg diff --git a/configs/conferences/qtcon16/QtCon_logo.png b/configs/conferences/qtcon16/QtCon_logo.png Binary files differindex 1342984..1342984 100644..100755 --- a/configs/conferences/qtcon16/QtCon_logo.png +++ b/configs/conferences/qtcon16/QtCon_logo.png diff --git a/configs/conferences/qtcon16/config.php b/configs/conferences/qtcon16/config.php index 238a2c9..c1407af 100644..100755 --- a/configs/conferences/qtcon16/config.php +++ b/configs/conferences/qtcon16/config.php @@ -123,7 +123,6 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array( 'b05b06', 'b07b08', 'b09', - 'a04', 'a08', ), ), diff --git a/configs/conferences/qtcon16/main.less b/configs/conferences/qtcon16/main.less index 6a1ab81..6a1ab81 100644..100755 --- a/configs/conferences/qtcon16/main.less +++ b/configs/conferences/qtcon16/main.less |
