Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a2696cf5

Commit a2696cf5 authored 8 years ago by Eugen Rochko

Downloads
- Plain Diff

Merge branch 'marrus-sh-mastodon-site-api'

parents 74ae158c 6be7bde2

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/api/v1/instances_controller.rb 7 additions, 0 deletions

app/controllers/api/v1/instances_controller.rb
app/views/api/v1/instances/show.rabl 6 additions, 0 deletions

app/views/api/v1/instances/show.rabl
config/routes.rb 2 additions, 0 deletions

config/routes.rb
docs/Using-the-API/API.md 7 additions, 0 deletions

docs/Using-the-API/API.md

with 22 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment