projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d4925a8
f3d4a69
)
Merge branch 'b-3.6.1' into mebil
author
Michael Wagner
<michael@wagnertech.de>
Fri, 15 Jul 2022 17:28:43 +0000
(19:28 +0200)
committer
Michael Wagner
<michael@wagnertech.de>
Fri, 15 Jul 2022 17:28:43 +0000
(19:28 +0200)
1
2
SL/DB/Helper/Mappings.pm
patch
|
diff1
|
diff2
|
blob
|
history
VERSION
patch
|
diff1
|
diff2
|
blob
|
history
menus/user/00-erp.yaml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
SL/DB/Helper/Mappings.pm
Simple merge
diff --cc
VERSION
index
ee5ae26
,
9575d51
..
95a00e4
---
1
/
VERSION
---
2
/
VERSION
+++ b/
VERSION
@@@
-1,1
-1,1
+1,1
@@@
- 3.5.8m1
-3.6.1
++3.6.1m1
diff --cc
menus/user/00-erp.yaml
Simple merge
projects / kivitendo-erp.git / commitdiff