Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
kaniini
pleroma
Commits
b114808a
Commit
b114808a
authored
6 years ago
by
lain
Browse files
Options
Downloads
Plain Diff
Merge branch 'import' into 'develop'
Fix follow errors See merge request
pleroma/pleroma!198
parents
0a0c6bf3
1525a040
Branches
feature/quarantine
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+4
-1
4 additions, 1 deletion
.gitignore
lib/pleroma/web/twitter_api/controllers/util_controller.ex
+1
-1
1 addition, 1 deletion
lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/web_finger/web_finger.ex
+46
-34
46 additions, 34 deletions
lib/pleroma/web/web_finger/web_finger.ex
with
51 additions
and
36 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
