Skip to content

Multiple Changes from Arman merged with Marie's

Marie Behzadi requested to merge (removed):master into master

there were 452 changes from arman and i almost checked them all. a lot of them didn't have any changes at all and i think some software could have changed the files not arman himself. anyway, i merged the branches and reviewd the conflicts, but i'm not 100% sure of the results so if by any chance you found any errors in the site, please review from this point.

Merge request reports