Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit a09de09

Browse files
committed
Merge branch 'switch_pytest' of github.com:BlueBrain/BluePyOpt into switch_pytest
2 parents ba11828 + aab9c81 commit a09de09

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Examples and test are BSD-licensed.
66
External dependencies are either LGPL or BSD-licensed.
77
See file ACKNOWLEDGEMENTS.txt and AUTHORS.txt for further details.
88

9-
Copyright (C) 2016-2021, Blue Brain Project/EPFL.
9+
Copyright (c) Blue Brain Project/EPFL 2016-2021.
1010

1111
This program is free software: you can redistribute it and/or modify it under
1212
the terms of the GNU Lesser General Public License as published by the

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Funding
197197
This work has been partially funded by the European Union Seventh Framework Program (FP7/2007­2013) under grant agreement no. 604102 (HBP), the European Union’s Horizon 2020 Framework Programme for Research and Innovation under the Specific Grant Agreement No. 720270, 785907 (Human Brain Project SGA1/SGA2) and by the EBRAINS research infrastructure, funded from the European Union’s Horizon 2020 Framework Programme for Research and Innovation under the Specific Grant Agreement No. 945539 (Human Brain Project SGA3).
198198
This project/research was supported by funding to the Blue Brain Project, a research center of the École polytechnique fédérale de Lausanne (EPFL), from the Swiss government’s ETH Board of the Swiss Federal Institutes of Technology.
199199

200-
© 2016-2021, Blue Brain Project/EPFL
200+
Copyright (c) Blue Brain Project/EPFL 2016-2021
201201

202202
..
203203
The following image is also defined in the index.rst file, as the relative path is

0 commit comments

Comments
 (0)