luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-10 20:27:12 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
6896 commits 1 branch 0 tags 248 MiB
Ruby 62.3%
JavaScript 24%
SCSS 6.9%
Haml 5%
TypeScript 1.5%
Other 0.2%
Go to file
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
.circleci
.github
app Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
docs
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
log
nanobox
public Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
streaming
vendor/assets
.babelrc
.buildpacks
.codeclimate.yml
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version
.scss-lint.yml
.slugignore
.travis.yml
.yarnclean
app.json
Aptfile
AUTHORS.md
boxfile.yml
Capfile
CODE_OF_CONDUCT.md
config.ru
CONTRIBUTING.md
docker-compose.yml
Dockerfile
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
jest.config.js
LICENSE
package.json
Procfile
Procfile.dev
Rakefile
README.md
scalingo.json
stack-fix.c
Vagrantfile
yarn.lock Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?