Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

be9665bf

Commit be9665bf authored 3 years ago by Malin Freeborn

Downloads
- Plain Diff

Merge branch 'dev' into mp

parents a2e5a0c0 d533a3f3

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 34 additions, 1 deletion

.gitignore
.gitignore 34 additions, 1 deletion

.gitignore
.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
.mailmap 2 additions, 0 deletions

.mailmap
CS/CS.tex 24 additions, 18 deletions

CS/CS.tex
Makefile 1 addition, 1 deletion

Makefile
combat.tex 4 additions, 8 deletions

combat.tex
gods.tex 9 additions, 9 deletions

gods.tex
intro.tex 1 addition, 0 deletions

intro.tex
knacks.tex 18 additions, 2 deletions

knacks.tex
rules.tex 16 additions, 2 deletions

rules.tex
spheres.tex 2 additions, 0 deletions

spheres.tex

with 146 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment