Skip to content

Commit

Permalink
Merge branch 'develop' into resolve_conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pavish authored Jan 28, 2025
2 parents a5328e9 + 5bd0a28 commit c302f3e
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</p>

<p align="center">
<a href="https://mathesar.org?ref=github-readme" target="_blank">Website</a> • <a href="https://docs.mathesar.org?ref=github-readme" target="_blank">Docs</a> • <a href="https://demo.mathesar.org?ref=github-readme" target="_blank">Live Demo</a> • <a href="https://wiki.mathesar.org/en/community/matrix" target="_blank">Matrix (chat)</a> • <a href="https://discord.gg/enaKqGn5xx" target="_blank">Discord</a> • <a href="https://wiki.mathesar.org/" target="_blank">Wiki</a>
<a href="https://mathesar.org?ref=github-readme" target="_blank">Website</a> • <a href="https://docs.mathesar.org?ref=github-readme" target="_blank">Docs</a> • <a href="https://wiki.mathesar.org/en/community/matrix" target="_blank">Matrix (chat)</a> • <a href="https://discord.gg/enaKqGn5xx" target="_blank">Discord</a> • <a href="https://wiki.mathesar.org/" target="_blank">Wiki</a>
</p>


Expand All @@ -27,7 +27,6 @@ You can use Mathesar to build **data models**, **enter data**, and even **build
- [Status](#status)
- [Join our community!](#join-our-community)
- [Screenshots](#screenshots)
- [Live Demo](#live-demo)
- [Features](#features)
- [Self-hosting](#self-hosting)
- [Our motivation](#our-motivation)
Expand Down Expand Up @@ -63,7 +62,7 @@ Our top sponsors! Become a sponsor on [GitHub](https://github.com/sponsors/mathe
We are currently in the **public alpha** stage.

## Join our community!
The Mathesar team is on [Matrix](https://wiki.mathesar.org/en/community/matrix) (chat service). We also have [mailing lists](https://wiki.mathesar.org/en/community/mailing-lists) and the core team discusses day-to-day work on our developer mailing list.
The Mathesar team is on [Matrix](https://wiki.mathesar.org/en/community/matrix) (chat service). We also have [mailing lists](https://wiki.mathesar.org/en/community/mailing-lists) and the core team discusses day-to-day work on our developer mailing list.

## Screenshots

Expand All @@ -77,10 +76,7 @@ The Mathesar team is on [Matrix](https://wiki.mathesar.org/en/community/matrix)

![arxiv-schema](https://user-images.githubusercontent.com/287034/220773323-bd6ffb31-835b-4df5-981e-dae6341d42bb.png)

![db-page](https://user-images.githubusercontent.com/287034/220773522-8c1c1483-2389-4f5e-83b2-e54836983035.png)

## Live Demo
Check out a [live demo of Mathesar here](https://demo.mathesar.org)!
![db-page](https://user-images.githubusercontent.com/287034/220773522-8c1c1483-2389-4f5e-83b2-e54836983035.png)

## Features
- **Built on Postgres**: Connect to an existing Postgres database or set one up from scratch.
Expand Down

0 comments on commit c302f3e

Please sign in to comment.