![]() Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |
![]() Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |