Skip to content
Snippets Groups Projects
Commit ad554efa authored by lfr20's avatar lfr20
Browse files

Merge branch 'master' into 'Develop'

# Conflicts:
#   src/App.js
parents 8d4de665 cf7ce0c5
Branches
Tags
2 merge requests!104Revert "Merge branch 'Develop_copy_to_implement_acessibility' into 'Develop'",!103Revert "Merge branch 'Develop_copy_to_implement_acessibility' into 'Develop'"
...@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License ...@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
var apiDomain = 'https://api.portalmectest.c3sl.ufpr.br', var apiDomain = 'https://api.portalmec.c3sl.ufpr.br',
apiVersion = 'v1', apiVersion = 'v1',
apiUrl = apiDomain + '/' + apiVersion; apiUrl = apiDomain + '/' + apiVersion;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment