Git ignore file updated
removed log file
Conflicts fixed
Conflicts fixed
Merge branch 'admin-theme' of https://github.com/roroacms/roroacms into admin-theme
Secret token deleted
security updates being added
Merge branch 'admin-theme' of https://github.com/roroacms/roroacms into admin-theme due to file removal