Merge branch 'master' into usergrid-1007-shiro-cache
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fed460b3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fed460b3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fed460b3 Branch: refs/heads/usergrid-1007-shiro-cache Commit: fed460b34935dba2970e002b1af7bab2688f0c87 Parents: 341b473 e7c805f Author: Dave Johnson <[email protected]> Authored: Thu Oct 15 14:09:26 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Oct 15 14:09:26 2015 -0400 ---------------------------------------------------------------------- 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(-) ----------------------------------------------------------------------
