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

Feature/147/traffic states with json #208

Open
wants to merge 10 commits into
base: development
Choose a base branch
from
Open

Feature/147/traffic states with json #208

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2451e91
feature/147/traffic_states
AyaHusein2001 Dec 6, 2022
47bbb7a
feature/147/traffic_states
AyaHusein2001 Dec 7, 2022
5d09d7b
Merge branch 'development' of https://github.com/RedditxClone/Fronten…
AyaHusein2001 Dec 7, 2022
6d39db6
feature/147/traffic_states
AyaHusein2001 Dec 7, 2022
b577122
feature/147/traffic_states
AyaHusein2001 Dec 7, 2022
adcd22d
feature/147/traffic_states
AyaHusein2001 Dec 14, 2022
4561c72
developing
AyaHusein2001 Dec 20, 2022
25f3a22
Merge branch 'feature/147/traffic_states' of https://github.com/Reddi…
AyaHusein2001 Dec 20, 2022
db2f64a
Please enter the commit message for your changes. Lines starting# wi…
AyaHusein2001 Dec 20, 2022
df5aa8a
developing
AyaHusein2001 Dec 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'development' of https://github.com/RedditxClone/Frontend … 
…into feature/147/traffic_states
  • Loading branch information
@AyaHusein2001
AyaHusein2001 committed Dec 7, 2022
commit 5d09d7b2cced52b8b1539246e1b953e502ec7b18
3 changes: 2 additions & 1 deletion reddit-front/src/pages/ModToolsPage/ModToolsPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
SideBarItem
} from './ModToolsPage.Style';
import './ModToolsPage.css';
import TrafficStates from '../../components/TrafficStates/TrafficStates';
import TrafficStates from '../../components/TrafficStates/TrafficStates';import ModQueue from '../../components/ModQueue/ModQueue';

/**
* This Component for the Moderator Tools Page
*
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.