Skip to content

Monetization - #17

Open
Villagers654 wants to merge 20 commits into
developfrom
monetization
Open

Monetization#17
Villagers654 wants to merge 20 commits into
developfrom
monetization

Conversation

@Villagers654

Copy link
Copy Markdown
Collaborator

No description provided.

# Conflicts:
#	backend/src/main/java/net/modtale/model/user/User.java
#	frontend/src/modules/admin/views/AdminPanel.tsx
#	frontend/src/modules/project/views/ProjectDetails.tsx
#	frontend/src/types.ts
# Conflicts:
#	README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant