Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/di/polls-ui-prototype' into sh/f…
Browse files Browse the repository at this point in the history 
…orm-ui

# Conflicts:
#	js/src/forum/components/CreatePollModal.js
#	js/src/forum/components/EditPollModal.js
#	js/src/forum/components/PollsDirectory.tsx
#	js/src/forum/extend.ts
  • Loading branch information
@novacuum
novacuum committed Feb 19, 2024
2 parents ab91275 + e4d779c commit 0b9216e
Showing 1 changed file with 0 additions and 151 deletions.
151 changes: 0 additions & 151 deletions js/src/forum/components/PollsDirectory.tsx
View file

This file was deleted.

0 comments on commit 0b9216e

Please sign in to comment.