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.

Sign up for GitHub

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

[ticket/16552] Roll back to FontAwesome 4.7 #6026

Merged
merged 5 commits into from Jul 22, 2020
Merged

[ticket/16552] Roll back to FontAwesome 4.7 #6026

merged 5 commits into from Jul 22, 2020

Conversation

3D-I
Copy link
Contributor

@3D-I 3D-I commented Jul 21, 2020 •
edited

PHPBB3-16552

Checklist:

  • Correct branch: master for new features; 3.3.x & 3.2.x for fixes
  • Tests pass
  • Code follows coding guidelines: master, 3.3.x and 3.2.x
  • Commit follows commit message format

https://tracker.phpbb.com/browse/PHPBB3-16552

@3D-I 3D-I marked this pull request as ready for review July 21, 2020 03:40
@3D-I
Copy link
Contributor Author

3D-I commented Jul 21, 2020

I think I am done here, not tested.

marc1706
marc1706 requested changes Jul 21, 2020
View reviewed changes
phpBB/adm/style/admin.css Show resolved Hide resolved
@marc1706 marc1706 added this to the 3.3.1 milestone Jul 21, 2020
@marc1706 marc1706 changed the base branch from 3.3.x to prep-release-3.3.1 July 21, 2020 08:03
@marc1706
Copy link
Member

Rebased onto prep-release-3.3.1

@3D-I
Copy link
Contributor Author

3D-I commented Jul 21, 2020

Rebased onto prep-release-3.3.1

Thanks, I was not sure so I went ahead and made the PR in any case.

3D-I and others added 5 commits July 21, 2020 11:58
@marc1706
[ticket/16552] Roll back to FontAwesome 4.7
4aa3a80 
PHPBB3-16552
@marc1706
[ticket/16552] Roll back to FontAwesome 4.7
193d54c 
Add migration font_awesome_5_rollback

PHPBB3-16552
@marc1706
[ticket/16552] Roll back to FontAwesome 4.7
034feb8 
Restore assets for FA 4.7

PHPBB3-16552
@marc1706
[ticket/16552] Roll back to FontAwesome 4.7
96bc21a 
Add missing content

PHPBB3-16552
@marc1706
[ticket/16552] Update stylesheet hashes
114ed8b 
PHPBB3-16552
@marc1706 marc1706 merged commit f269dda into phpbb:prep-release-3.3.1 Jul 22, 2020
@3D-I 3D-I deleted the ticket/16552 branch July 22, 2020 08:08
@Crizz0 Crizz0 mentioned this pull request Sep 20, 2020
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marc1706 marc1706 marc1706 approved these changes

Assignees
No one assigned
Labels
3.3 (Proteus) 🌑
Projects
None yet
Milestone
3.3.1
3 participants
@3D-I @marc1706 @phpbb-user