Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into remove-inmemory-event-service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4992f5ca Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4992f5ca Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4992f5ca Branch: refs/heads/master Commit: 4992f5cab75b0ce0bb8c591ea00182a6dc186e64 Parents: 9673169 e7c805f Author: Shawn Feldman <[email protected]> Authored: Fri Oct 16 15:08:32 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri Oct 16 15:08:32 2015 -0600 ---------------------------------------------------------------------- website/content/community/index.html | 2 +- website/content/img/mike_d.JPG | Bin 36443 -> 0 bytes website/content/img/miked.jpg | Bin 0 -> 36443 bytes 3 files changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
