From: Kern Sibbald Date: Wed, 14 Oct 2009 16:15:06 +0000 (+0200) Subject: Add new files X-Git-Tag: Release-3.0.3~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80669745be56fe68d2998e9603d5f661dca8ff0d;p=bacula%2Fdocs Add new files --- 80669745be56fe68d2998e9603d5f661dca8ff0d diff --cc docs/home-page/de/pages/testimonial.php index c25aeb20,a3f62216..fa1879a0 --- a/docs/home-page/de/pages/testimonial.php +++ b/docs/home-page/de/pages/testimonial.php @@@ -20,12 -20,12 +20,19 @@@ $org_type_lst = array $version_lst = array( 'empty' => "SELECT ONE", ++<<<<<<< HEAD ++======= + '206' => "3.0.x", ++>>>>>>> ce16a41849ac5434c59158bfb03ec94c11334ef8 '200' => "1.36.x", '201' => "1.38.x", '202' => "2.0.x", '203' => "2.2.x", '206' => "2.4.x", ++<<<<<<< HEAD + '206' => "3.0.x", ++======= ++>>>>>>> ce16a41849ac5434c59158bfb03ec94c11334ef8 '204' => "GIT master version" ); @@@ -209,11 -209,12 +216,19 @@@ if ($_REQUEST['action'] == 'Add' or $_R