Ariel Ben-Yehuda e7e1fd20de Fix rebase conflicts

2015-05-19 22:54:44 +03:00

..

builtin.rs

Fix rebase conflicts

2015-05-19 22:54:44 +03:00

lib.rs

libs: Move favicon URLs to HTTPS

2015-05-15 16:04:01 -07:00