Merge branch 'develop'
Showing
- SickBeard.py 9 additions, 9 deletionsSickBeard.py
- gui/slick/js/core.js 23 additions, 2 deletionsgui/slick/js/core.js
- gui/slick/js/core.min.js 0 additions, 0 deletionsgui/slick/js/core.min.js
- gui/slick/views/addShows.mako 6 additions, 16 deletionsgui/slick/views/addShows.mako
- gui/slick/views/addShows_recommendedShows.mako 0 additions, 48 deletionsgui/slick/views/addShows_recommendedShows.mako
- gui/slick/views/addShows_trendingShows.mako 17 additions, 6 deletionsgui/slick/views/addShows_trendingShows.mako
- gui/slick/views/config_notifications.mako 3 additions, 3 deletionsgui/slick/views/config_notifications.mako
- gui/slick/views/config_providers.mako 1 addition, 1 deletiongui/slick/views/config_providers.mako
- gui/slick/views/config_subtitles.mako 7 additions, 13 deletionsgui/slick/views/config_subtitles.mako
- gui/slick/views/displayShow.mako 6 additions, 6 deletionsgui/slick/views/displayShow.mako
- gui/slick/views/inc_blackwhitelist.mako 3 additions, 3 deletionsgui/slick/views/inc_blackwhitelist.mako
- gui/slick/views/manage.mako 26 additions, 5 deletionsgui/slick/views/manage.mako
- gui/slick/views/manage_manageSearches.mako 4 additions, 4 deletionsgui/slick/views/manage_manageSearches.mako
- gui/slick/views/manage_massEdit.mako 3 additions, 6 deletionsgui/slick/views/manage_massEdit.mako
- gui/slick/views/restart.mako 5 additions, 2 deletionsgui/slick/views/restart.mako
- gui/slick/views/trendingShows.mako 7 additions, 6 deletionsgui/slick/views/trendingShows.mako
- lib/certifi/__init__.py 3 additions, 1 deletionlib/certifi/__init__.py
- lib/certifi/cacert.pem 184 additions, 698 deletionslib/certifi/cacert.pem
- lib/certifi/core.py 18 additions, 1 deletionlib/certifi/core.py
- lib/certifi/old_root.pem 27 additions, 0 deletionslib/certifi/old_root.pem
Loading
Please register or sign in to comment