You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/08/22 15:00:54 UTC
[50/50] usergrid git commit: Merge branch 'asf-site' of
https://git-wip-us.apache.org/repos/asf/usergrid into asf-site
Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid into asf-site
* 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid:
# Conflicts:
# website/tmp/checksums
# website/tmp/compiled_content
# website/tmp/dependencies
# website/tmp/rule_memory
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2d4d8aaa
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2d4d8aaa
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2d4d8aaa
Branch: refs/heads/asf-site
Commit: 2d4d8aaad8f0cf9a8575a886c809e4d0263d070c
Parents: f0a2f8c 85ca4b8
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Aug 22 10:59:13 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Aug 22 10:59:13 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------