Abdullah Almsaeed 4169db0857 Resolve conflicts

2017-05-18 08:11:54 -04:00

..

css

Resolve conflicts

2017-05-18 08:11:54 -04:00

img

Fix #1296

2017-01-08 15:07:55 -05:00

js

Update modal page to add buttons and animation

2017-05-17 19:21:12 -04:00