{"shas":[["c53f0a67ecc20fbdcf18de53d100b466c9ce2e83","5ca27e75aea3e5e83a04c6cfa5f1b63d358cd03d@grahamweldon.com","Added language default option to user edit view, and reformatted code for candy helper language options and edit view.","Graham Weldon"],["81826d52880c37fb8841cc15be85d21fdb54a7a4","5ca27e75aea3e5e83a04c6cfa5f1b63d358cd03d@grahamweldon.com","merged.\nFixed user settings not being saved when password was omitted","Graham Weldon"],["1fb7f1fdab6c53b8628f4f9316e9545fc38489f0","56b6d267488ad445c73f5bde917baa8c85477f15@gmail.com","Merge branch 'master' of https://github.com/predominant/candycane into graham-merge\n\nConflicts:\n\tapp/controllers/users_controller.php","yandod"],["cdd0d83bd8d82cd8a52ec5dbde3acae376694e3d","56b6d267488ad445c73f5bde917baa8c85477f15@gmail.com","merging graham's branch.","yandod"],["7906ce7c32c882145eaef30177ecff996b6151a1","56b6d267488ad445c73f5bde917baa8c85477f15@gmail.com","redo missing change.","yandod"],["045fda31b656dadc8f74a29b736db224320e27bd","56b6d267488ad445c73f5bde917baa8c85477f15@gmail.com","typo","yandod"],["d906831c074c2a72635aba46bff469e974d6a6b9","56b6d267488ad445c73f5bde917baa8c85477f15@gmail.com","update readme.","yandod"],["e0db9d081ed9da9919a990eb5ed820bd0b9e57c9","5ca27e75aea3e5e83a04c6cfa5f1b63d358cd03d@grahamweldon.com","Added doc blocks.","Graham Weldon"]],"ref":"refs/heads/master","size":8,"head":"e0db9d081ed9da9919a990eb5ed820bd0b9e57c9","push_id":43209903}