resolved conflict - #118

Open

danieliheonu wants to merge 11 commits into

rijentech:devfrom

danieliheonu:dev

Commits on Jan 29, 2022

omitted market email template in the initial commit
danieliheonu
committed
167d8dc
resolves issue #47
danieliheonu
committed
3129b34
paginated get_all_posts resolves #48
danieliheonu
committed
3c7c4eb
removed BlogUpdate and BlogCreate resolves #49
danieliheonu
committed
1a58f71
made blog post title not unique and made updating of a blog post to be done by the user while deleting of blog post to be done by either the user or superuser resolves #50 #51
danieliheonu
committed
7f6f070

Commits on Jan 30, 2022

Commits on Feb 19, 2022

resolved conflicts
danieliheonu
committed
603b370
resolved conflicts
danieliheonu
committed
9d2fb2c

Commits on Feb 20, 2022

added soft delete to requirements.txt file
danieliheonu
committed
798f601

Commits on Feb 23, 2022

resolved conflicts
danieliheonu
committed
ac6172f