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

bec1dbd4

Commit bec1dbd4 authored 3 years ago by Malin Freeborn

Downloads
- Plain Diff

Merge branch 'dev' into mp

parents d4ae5e15 588578d8

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 3 additions, 1 deletion

Makefile
cc.tex 9 additions, 11 deletions

cc.tex
combat.tex 3 additions, 2 deletions

combat.tex
config/bind.sty 3 additions, 2 deletions

config/bind.sty
config/monsters.sty 2 additions, 2 deletions

config/monsters.sty
gm.tex 1 addition, 1 deletion

gm.tex
images/artists.md 4 additions, 5 deletions

images/artists.md
intro.tex 16 additions, 15 deletions

intro.tex
rules.tex 7 additions, 7 deletions

rules.tex
spheres.tex 16 additions, 11 deletions

spheres.tex
stories.tex 1 addition, 1 deletion

stories.tex

with 65 additions and 58 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