Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

the hurlers
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c234ba5f

Commit c234ba5f authored 4 years ago by Andrea Magnussen

Downloads
- Plain Diff

Merge branch 'master' into '11-ui-design'

# Conflicts:
#   src/sample/sample.fxml

parents af1e26e7 a126ab9e

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/sample/Controller.java 8 additions, 7 deletions

src/sample/Controller.java
src/sample/Main.java 4 additions, 4 deletions

src/sample/Main.java
src/sample/ThoughtManager.java 36 additions, 0 deletions

src/sample/ThoughtManager.java

with 48 additions and 11 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