Viewing all changes in revision 28.

Committer: Sovello Hildebrand
Date: 2014-12-19 13:48:51 UTC
Revision ID: sovellohpmgani@gmail.com-20141219134851-op9yimwt1zvj90im

resolved conflict in site configuration module file by taking one from the working tree

added added

removed removed