diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-10-11 16:36:02 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-10-11 16:36:02 +0000 |
| commit | 9666ac2127df25f7b9d761474e72b892e40a6af1 (patch) | |
| tree | 7047816719c824c79c6d40371d7eb7b944ad6db0 /.idea/copyright | |
| parent | 8b85d2b8ee8d5373dd0cd60bcf18290a8c854467 (diff) | |
| parent | 95e68cbbe748f81af1113753c5b99929e3db9ea2 (diff) | |
Merge branch 'epic18-standalone_trackers_alone' into 'main'
epic18: Trackers control on standalone app (without Ipscrambling).
See merge request e/os/advanced-privacy!147
Diffstat (limited to '.idea/copyright')
| -rw-r--r-- | .idea/copyright/MURENA.xml | 6 | ||||
| -rw-r--r-- | .idea/copyright/profiles_settings.xml | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/.idea/copyright/MURENA.xml b/.idea/copyright/MURENA.xml deleted file mode 100644 index 0c0ee95..0000000 --- a/.idea/copyright/MURENA.xml +++ /dev/null @@ -1,6 +0,0 @@ -<component name="CopyrightManager"> - <copyright> - <option name="notice" value="Copyright (C) &#36;today.year MURENA SAS This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>." /> - <option name="myName" value="MURENA" /> - </copyright> -</component>
\ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e9f8efd..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ -<component name="CopyrightManager"> - <settings default="E_Foundation" /> -</component>
\ No newline at end of file |