Merge remote-tracking branch 'origin/master' into darksideofmakerlog
Merge remote-tracking branch 'origin/master' into darksideofmakerlog
# Conflicts:
# src/components/ProjectLink.js
# src/features/products/components/Product/components/ProductMedia/ProductMedia.js
# src/features/users/components/PeopleCard/PeopleCard.js
# src/layouts/App/App.js
# src/layouts/App/routes.js
# src/lib/utils/tasks.js
# src/pages/AppsPage/apps/Trello/Trello.js
# src/pages/DiscussionsPage/DiscussionsPage.js
# src/pages/TasksPage/components/Navigation.js
Merge remote-tracking branch 'origin/master' into darksideofmakerlog
# Conflicts:
# src/features/products/components/Product/Product.js
# src/features/products/components/Product/components/ProductMedia/ProductMedia.js
# src/features/products/components/ProductCreateWizard/ProductCreateWizard.js
# src/layouts/Footer/index.js
# src/layouts/Navbar/components/LoggedInMenu.js
# src/pages/LoginPage/components/LoginForm.js
# src/pages/RegisterPage/RegisterPage.js
Merge remote-tracking branch 'origin/master' into darksideofmakerlog
# Conflicts:
# src/pages/OpenPage/OpenPage.js
08 Apr Check and fix post-merge
08 Apr corrected invalid conflict solving from prev merge
08 Apr - Merge remote-tracking branch 'origin/master' into darksideofmakerlog
# Conflicts:
# src/components/badges/index.js
# src/features/stream/components/Editor/Editor.scss
# src/features/stream/components/NoActivityCard/NoActivityCard.css
# src/features/stream/components/NoActivityCard/NoActivityCard.js
# src/features/stream/components/Stream/components/StreamSection/StreamDateHeader.js
# src/features/stream/components/Task/components/Praise/Praisable.js
# src/layouts/Navbar/components/LoggedInMenu.js
# src/layouts/Page.js
# src/pages/DiscussionsPage/DiscussionsPage.js
# src/pages/HomePage/HomePage.js
# src/pages/RegisterPage/RegisterPage.js
# src/pages/StreamPage/components/StreamHeader.js
Merge remote-tracking branch 'origin/master' into darksideofmakerlog
Pushed 1 change to Makerlog Server
Work on a diagram for - send to upric
Somebody just sent me ☕️ 1 coffees on BuyMeACoffee.com/mattei
Merge branch 'alinasava/web-dev-a' into 'master'
Fixed badges on <768px (badges now go under username to fit)
See merge request makerlog/web!39
Fixed badges on <768px (badges now go under username to fit)
