Danila Fedorin 2e14a70950 Merge branch 'inv-trig' ... # Conflicts: # src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java		2017-08-11 12:29:12 -07:00
..
org/nwapw/abacus	Merge branch 'inv-trig'	2017-08-11 12:29:12 -07:00