Viewing all changes in revision 33.

Committer: GitHub
Author(s): Sergio Cazzolato
Date: 2018-01-26 14:04:45 UTC
mfrom: <a title="Merged From 32.1.3" href="/~snappy-dev/spread-cron/trunk/revision/32.1.3">(32.1.3)
Revision ID: git-v1:bdae55c2b39b8abbad4f1d9fa195ce18f3f6aff0

Merge pull request #52 from sergiocazzolato/fix-pull-with-conflicts

Fix pull with conflicts

added added

removed removed

~snappy-dev/spread-cron/trunk