Skip to content
This repository has been archived by the owner. It is now read-only.

/ browser-android Archived

AB2-772 Merging Fennec 65.0 #611

Merged
merged 14 commits into from Feb 1, 2019
Merged

AB2-772 Merging Fennec 65.0 #611

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6384201
AB2-772 Merging Fennec 65.0
spacifici Jan 31, 2019
125a351
photon gets merged with base
giota-cliqz Jan 31, 2019
34731da
AB2-772-1 Solving build system conflicts
spacifici Jan 31, 2019
1b2f9de
AB2-722-1 Preferences conflicts
spacifici Jan 31, 2019
d542c21
AB2-772-1 Restore the Cliqz version of the home_pager.xml
spacifici Jan 31, 2019
d9fd7c9
AB-772-1 BrowserApp.java fixes
spacifici Jan 31, 2019
d64d9a1
AB2-772-1 Removing WebcompatReporter.js
spacifici Jan 31, 2019
21b8b49
AB-772-1 Specific Cliqz Icons moved from Photon to main
spacifici Jan 31, 2019
309e1a3
AB-772-1 merging large-v17 styles
spacifici Feb 1, 2019
073cb7b
AB2-772-1 fixing all the remaining values (styles, dimensions, colors)
spacifici Feb 1, 2019
24a9f96
AB-772-2 Moving remaining resources to main
spacifici Feb 1, 2019
a0278fe
Merge 'upstream/master' into AB2-772
spacifici Feb 1, 2019
f638c73
Small fixes, problems discovered while compiling
spacifici Feb 1, 2019
5b1feab
AB-772-3 Adding updated translations from Mozilla
spacifici Feb 1, 2019
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next

AB-772-2 Moving remaining resources to main

  • Loading branch information
@spacifici
spacifici committed Feb 1, 2019
commit 24a9f96c91b64e98c638ed4a7e2a7f88f127f020
0 ...lor/top_news_item_background_selector.xml → ...lor/top_news_item_background_selector.xml
View file
Open in desktop
File renamed without changes.
0 ...hoton/res/drawable/ic_action_collapse.xml → .../main/res/drawable/ic_action_collapse.xml
View file
Open in desktop
File renamed without changes.
0 .../photon/res/drawable/ic_action_expand.xml → ...rc/main/res/drawable/ic_action_expand.xml
View file
Open in desktop
File renamed without changes.
ProTip! Use n and p to navigate between commits in a pull request.