Danila Fedorin 75824a2a77 Merge branch 'provider-rewrite' into sin ... # Conflicts: # src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java		2017-08-04 11:54:12 -07:00
..
java/org/nwapw/abacus	Merge branch 'provider-rewrite' into sin	2017-08-04 11:54:12 -07:00