Merge pull request #579 from k33ptoo/gui
GUI Update - SPARK-2214
Amos Chepchieng <akchieng@gmail.com>
f7660c4ed65e6f249756753d9607ca887fb6400bm
Update Preference UI. Update all visible icons to Material Outline Gray
Amos Chepchieng <keeptoo.ui.ux@gmail.com>
816521d58bba843c12d6621b57396746d7162fd4m
Merge pull request #4 from igniterealtime/master
Update gui branch
Amos Chepchieng <akchieng@gmail.com>
af9d7aea7544595d19aef267eb0c0e3ec3ae70dfm
Merge branch 'master' of https://github.com/igniterealtime/Spark into igniterealtime-master
# Conflicts:
# core/src/main/java/org/jivesoftware/spark/ui/themes/LookAndFeelManager.java
Amos Chepchieng <akchieng@gmail.com>
6ed22920248d224779f30064e4cd12419d5b68c5m
Merge branch 'master' of github.com:k33ptoo/Spark into gui
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.