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

Reportarticle #70

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Reportarticle #70

wants to merge 15 commits into from

Conversation

MinaHany94
Copy link
Collaborator

No description provided.

This reverts commit db1401b.
…into ReportArticle

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/articles_controller.rb
	app/models/ability.rb
	app/models/article.rb
	app/models/user.rb
	app/views/articles/show.html.erb
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/09e2a090befacdae0db10cafb1893a0a
	tmp/cache/assets/development/sprockets/2b38c3fb549036de5c4666637a0c80c6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant