Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/6.0' into 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
CI bot committed Nov 26, 2024
2 parents 1498694 + e50b16a commit 5a919df
Show file tree
Hide file tree
Showing 6 changed files with 2,671 additions and 1,671 deletions.
4 changes: 1 addition & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
The Oro Platform Software

The MIT License (MIT)

Copyright (c) 2013 - 2017, Oro, Inc.
Copyright (c) 2024 Oro Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
"description": "Oro Platform Empty Application",
"homepage": "https://github.com/oroinc/platform-application.git",
"license": "MIT",
"authors": [
{
"name": "Oro, Inc",
"homepage": "https://oroinc.com/"
}
],
"autoload": {
"psr-4": {"": "src/"},
"classmap": [
Expand All @@ -15,7 +21,7 @@
"repositories": {
"composer": {
"type": "composer",
"url": "https://packagist.orocrm.com"
"url": "https://packagist.oroinc.com"
}
},
"require": {
Expand Down
8 changes: 7 additions & 1 deletion dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
"description": "Oro Platform Empty Application",
"homepage": "https://github.com/oroinc/platform-application.git",
"license": "MIT",
"authors": [
{
"name": "Oro, Inc",
"homepage": "https://oroinc.com/"
}
],
"autoload": {
"psr-4": {"": "src/"},
"classmap": [
Expand All @@ -19,7 +25,7 @@
},
{
"type": "composer",
"url": "https://packagist.orocrm.com"
"url": "https://packagist.oroinc.com"
}
],
"require": {
Expand Down
Loading

0 comments on commit 5a919df

Please sign in to comment.