Revert "Merge branch 'master' into 'prod'" (!66) · Merge requests · Lennart Franken / Webvokabeln · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Merged Revert "Merge branch 'master' into 'prod'"

master into prod

Merged Lennart Franken requested to merge master into prod 2 years ago

Jul 01, 2022
- Added markdown area for multiple apps fix 2 · 1321e9b7
  Lennart Franken authored 2 years ago
  
  1321e9b7
- Merge branch 'prod' into 'master' · e8bde5d0
  Lennart Franken authored 2 years ago
```
# Conflicts:
#   code/apps/accounts/code/render.py
```
  e8bde5d0
- Added markdown area for multiple apps fix 1 · 1b2e4d23
  Lennart Franken authored 2 years ago
  
  1b2e4d23
Jun 30, 2022
- Merge branch 'revert-489689d3' into 'master' · 583f4581
  Lennart Franken authored 2 years ago
```
Revert "Merge branch 'master' into 'prod'"

See merge request !62
```
  583f4581
- Revert "Merge branch 'master' into 'prod'" · 9631e6fa
  Lennart Franken authored 2 years ago
```
This reverts merge request !61
```
  9631e6fa
- Showlink property for markdown areas · b66a1f01
  Lennart Franken authored 2 years ago
  
  b66a1f01
Jun 29, 2022
- Added markdown editor for multiple apps · 26804d8b
  Lennart Franken authored 2 years ago
  
  26804d8b
- Added autosize for markdown textareas · 09346e17
  Lennart Franken authored 2 years ago
  
  09346e17