Viewing all changes in revision 2252.
- Committer: Jeremy Wootten
- Date: 2016-08-05 17:36:27 UTC
- mfrom: (2250.1.24 pantheon-files)
- Revision ID: jeremy@elementaryos.org-20160805173627-qxomtjvl9rhsaeza
Merge trunk to r2274 and resolve conflict
- files added:
- po/aa.po
- po/extra
- files renamed:
- data/org.pantheon.files.appdata.xml => data/org.pantheon.files.appdata.xml.in
- files modified:
- cmake/Translations.cmake
expand all
collapse all
added
removed
