Quantcast

Merge branch 'master' into 'master'

Author Darth Predator <darthpred@gmail.com>
Author date 2016-11-17 15:01:33
Author local date 2016-11-17 10:01:33 -0500
Committer Darth Predator <darthpred@gmail.com>
Committer date 2016-11-17 15:01:33
Committer local date 2016-11-17 10:01:33 -0500
Commit ecd5b0a1ca4b5b45017429372fff5cb8509f6558
Tree b6e757a438ebe3f9bc2aaa175d954a3f54f61198
Parent 14e96339346857b3ec393f05868b92dab5e9f6ff
Parent a2958dfa27a78ee39317738de3920c16bc24af1c
Merge branch 'master' into 'master'

New RoleIcons (Lyn)

I bet, this time you can merge this shit :dromedary_camel:

See merge request !12