Merge remote-tracking branch 'origin/master' into payzen-fixup

master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_site_preference.xml

@@ -395,7 +395,7 @@ It\'s the lowest priority one; ie. managers can create higher priority preferenc
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <int>3</int> </value>
+            <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>rights</string> </key>

master/bt5/vifib_data/bt/revision

-101
\ No newline at end of file
+102
\ No newline at end of file

master/bt5/vifib_slapos_core/bt/license

+GPL
\ No newline at end of file

master/bt5/vifib_slapos_core/bt/revision

+1
\ No newline at end of file

master/bt5/vifib_slapos_core/bt/template_format_version

+1
\ No newline at end of file

master/bt5/vifib_slapos_core/bt/title

+vifib_slapos_core
\ No newline at end of file

master/bt5/vifib_slapos_core/bt/version

+0.1
\ No newline at end of file