Viewing all changes in revision 2367.1.7.
- Committer: Jeremy Wootten
- Date: 2017-06-06 09:00:33 UTC
- mfrom: (2573 pantheon-files)
- mto: This revision was merged to the branch mainline in revision 2574.
- Revision ID: jeremy@elementaryos.org-20170606090033-4mtmznnkm8i01agw
Merge trunk to r2573 and resolve conflict in AbstractDirectoryView
- files modified:
- src/View/AbstractDirectoryView.vala
expand all
collapse all
added
removed
