Anthony Restaino 240c9a5a37 Merge remote-tracking branch 'origin/master' into dev ... Conflicts: app/src/main/res/values-fr/strings.xml		2015-07-29 21:44:33 -04:00
..
lightningLite	Moved proxy code to utility class, remove proxy from lite version to reduce apk size	2015-06-05 00:03:02 -04:00
LightningPlus	Snackbar >>>>>>> Toast	2015-07-19 16:49:55 -04:00
main	Merge remote-tracking branch 'origin/master' into dev	2015-07-29 21:44:33 -04:00