Simon Babay 8edb33f511 Merge remote-tracking branch 'refs/remotes/jshjohnson/master' ... Conflicts: assets/scripts/src/choices.js		2016-08-01 21:27:41 +02:00
..
icons	Close button styling	2016-05-11 23:17:22 +01:00
scripts	Merge remote-tracking branch 'refs/remotes/jshjohnson/master'	2016-08-01 21:27:41 +02:00
styles	Merged branch master into pr-issue-8	2016-08-01 15:50:08 +02:00