Patrick Kuo b9b90dffcd Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/modules.xml # settings.gradle		2016-10-28 15:54:03 +01:00
..
dictionaries	Add further words to dictionary	2016-09-21 10:50:28 +01:00
runConfigurations	.idea: Share explorer configuration	2016-09-20 13:42:01 +01:00
modules.xml	Removed the plugin registry that pointed to non-existent classes.	2016-10-13 11:26:49 +01:00