Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
2025-02-27 12:22:30 +00:00 · 2025-02-26 20:55:57 +00:00 · 2025-02-26 20:29:42 +00:00 · 2025-02-26 12:47:54 +00:00 · 2025-02-26 12:02:00 +00:00 · 2025-02-26 11:59:53 +00:00
1 changed files with 1 additions and 1 deletions
--- a/config/version.php
+++ b/config/version.php
@@ -6,5 +6,5 @@ return array (
  'prerelease_version' => '',
  'hash_version' => 'g44dd06161',
  'full_hash' => 'v8.0.2-54-g44dd06161',
-  'branch' => 'develop',
+  'branch' => 'master',
 );
Author	SHA1	Message	Date
snipe	df38d7e3ed	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2025-02-27 12:22:30 +00:00
snipe	44dd061619	Merge remote-tracking branch 'origin/develop'	2025-02-26 20:55:57 +00:00
snipe	7603a932b1	Merge remote-tracking branch 'origin/develop'	2025-02-26 20:29:42 +00:00
snipe	138e7acc13	Merge remote-tracking branch 'origin/develop'	2025-02-26 12:47:54 +00:00
snipe	e863d3e7e5	Merge remote-tracking branch 'origin/develop'	2025-02-26 12:02:00 +00:00
snipe	c8e401f5ed	Merge remote-tracking branch 'origin/develop'	2025-02-26 11:59:53 +00:00
snipe	3ba20a8e28	Merge remote-tracking branch 'origin/develop'	2025-02-26 11:39:10 +00:00
snipe	ebae63752f	Merge remote-tracking branch 'origin/develop'	2025-02-26 10:25:18 +00:00
snipe	8bc73901cf	Merge remote-tracking branch 'origin/develop'	2025-02-26 08:25:35 +00:00
snipe	b4f70d9244	Merge remote-tracking branch 'origin/develop'	2025-02-26 07:16:59 +00:00
snipe	21e9f2bba3	Merge remote-tracking branch 'origin/develop'	2025-02-26 07:11:22 +00:00
snipe	881f4e3d6a	Merge remote-tracking branch 'origin/develop'	2025-02-25 14:43:57 +00:00
snipe	b141945add	Updated branch Signed-off-by: snipe <snipe@snipe.net>	2025-02-25 12:18:52 +00:00