GitLab

Revert modifications

This reverts commit 047d1c10.

Revert merge

New dashboard

See merge request !14

Merge with master

Update GlobalStateReducer.js

See merge request !13

New dashboard

See merge request !11

# Conflicts:
#   client/src/contexts/GlobalStateReducer.js
#   client/src/services/FetchData.js

This reverts commit 36031d60, reversing
changes made to 3e05a550.

Reverting merge

Updating the dashboard.

# Conflicts:
#   client/src/contexts/GlobalStateReducer.js
#   client/src/pages/asteroids/Aladin.jsx
#   client/src/pages/asteroids/AsteroidsPage.js
#   client/src/pages/dashboard/DashboardPage.js
#   client/src/services/FetchData.js
#   server_mysql/index.js

Integrating skymap and its features to the new ICARE folder

See merge request !7

Cleaning the old/useless folders and merging with master for a brand new start

See merge request !4

Commit test

See merge request !3