Skip to content

Commit

Permalink
Merge branch 'switch_pytest' of github.com:BlueBrain/BluePyOpt into s…
Browse files Browse the repository at this point in the history
…witch_pytest
  • Loading branch information
wvangeit committed Apr 20, 2021
2 parents ba11828 + aab9c81 commit a09de09
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Examples and test are BSD-licensed.
External dependencies are either LGPL or BSD-licensed.
See file ACKNOWLEDGEMENTS.txt and AUTHORS.txt for further details.

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

This program is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Funding
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).
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.

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

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

0 comments on commit a09de09

Please # to comment.