John Preston 17114350c4 conflicts fixed		2015-10-23 18:18:43 +02:00
..
lang.strings	share support added	2015-10-18 14:49:34 +02:00
numbers.txt	merged master	2015-08-18 19:10:01 +03:00
style.txt	conflicts fixed	2015-10-23 18:18:43 +02:00
style_classes.txt	conflicts fixed	2015-10-23 18:18:43 +02:00