matrix07012 :thotpatrol:
Follow

How do I solve this merge conflict?

· · Web · 2 · 0 · 0
matrix07012 :thotpatrol:

Without changing master

0
Gay, loud and annoying ! :flag: :transdprk:
@matrix

IMAGE_LIMIT (ENV['MAX_IMG_SIZE'] || 8).megabytes

?
1
matrix07012 :thotpatrol:

@hj :bigbrain:

0
Sign in to participate in the conversation
Game Liberty Mastodon

Mainly gaming/nerd instance for people who value free speech. Everyone is welcome.

Trending now

Resources

Developers

What is Mastodon?

gameliberty.club

More…

v3.5.19 · Privacy policy