Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/usergrid into asf-site
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0fd9939b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0fd9939b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0fd9939b Branch: refs/heads/usergrid-1318-queue Commit: 0fd9939bc004d6500293edb85a525bcf1f8e6bc3 Parents: 9d3cf5b f3879a4 Author: Dave Johnson <[email protected]> Authored: Fri Oct 30 15:04:03 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri Oct 30 15:04:03 2015 -0400 ---------------------------------------------------------------------- content/community/index.html | 2 +- content/img/miked.jpg | Bin 0 -> 36443 bytes website/tmp/checksums | 4 ++-- website/tmp/compiled_content | 16 ++++++++-------- website/tmp/dependencies | 2 +- website/tmp/rule_memory | Bin 5163 -> 5214 bytes 6 files changed, 12 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
