Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove now unnecessary approachcircle proxy disables #2374

Merged
merged 5 commits into from Apr 20, 2018
Merged

Remove now unnecessary approachcircle proxy disables #2374

merged 5 commits into from Apr 20, 2018

Conversation

smoogipoo
Copy link
Contributor

@smoogipoo smoogipoo commented Apr 9, 2018 •
edited by peppy

@smoogipoo smoogipoo added osu!framework issue Can't resolve this without changes to osu!framework. type:code-quality and removed osu!framework issue Can't resolve this without changes to osu!framework. labels Apr 9, 2018
@smoogipoo smoogipoo added this to the April 2018 milestone Apr 9, 2018
@smoogipoo
Merge remote-tracking branch 'origin/master' into remove-approachcirc…
c9e4a07 
…le-hax

# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@smoogipoo
Update framework + fix CI errors
0dce7a5
@peppy peppy merged commit 54ab001 into ppy:master Apr 20, 2018
@smoogipoo smoogipoo deleted the remove-approachcircle-hax branch June 15, 2018 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peppy peppy peppy approved these changes

Assignees
No one assigned
Labels
type:code-quality
Projects
None yet
Milestone
April 2018
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@smoogipoo @peppy